The code.ill.fr has been recreated and upgraded with the latest version this weekend, If you encounter any problem please inform the Helpdesk.

Commit 0f5d2126 authored by Remi Perenon's avatar Remi Perenon
Browse files

Updating CI for HDF reading

parent f021126f
Pipeline #8724 passed with stages
in 14 minutes and 53 seconds
......@@ -35,7 +35,7 @@ make:linux_gfortran:
script:
- docker build --force-rm -t ci_crysfml_xenial_gfortran -f ${CI_PROJECT_DIR}/BuildServer/Docker/Dockerfile_xenial_gfortran_setup .
- docker build --force-rm --no-cache -t ci_crysfml_xenial_gfortran_build -f ${CI_PROJECT_DIR}/BuildServer/Docker/Dockerfile_xenial_gfortran_build --build-arg CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHORT_SHA} --build-arg CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} .
- docker run -iv${PWD}:/artifacts/ ci_crysfml_xenial_gfortran_build
- docker run -i -v${PWD}:/artifacts/ -v/users/ci/projects/fullprof/hdf5-1_12_0-gfortran:/hdf5 ci_crysfml_xenial_gfortran_build
tags:
- docker
- sci
......@@ -57,7 +57,7 @@ make:linux_gfortran_F2008:
script:
- docker build --force-rm -t ci_crysfml_xenial_gfortran_f2008 -f ${CI_PROJECT_DIR}/BuildServer/Docker/Dockerfile_xenial_gfortran_setup_F2008 .
- docker build --force-rm --no-cache -t ci_crysfml_xenial_gfortran_build_f2008 -f ${CI_PROJECT_DIR}/BuildServer/Docker/Dockerfile_xenial_gfortran_build_F2008 --build-arg CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHORT_SHA} --build-arg CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} .
- docker run -iv${PWD}:/artifacts/ ci_crysfml_xenial_gfortran_build_f2008
- docker run -i -v${PWD}:/artifacts/ ci_crysfml_xenial_gfortran_build_f2008
tags:
- docker
- sci
......@@ -117,10 +117,10 @@ make:macos_ifort_F2008:
make:windows_gfortran:
stage: make
script:
- set PATH=c:\Projects\fullprof\python37;%PATH%
- set PATH=c:\Projects\fullprof\python37;C:\\Projects\\fullprof\\hdf5-gfortran\\bin;%PATH%
- set PATH=c:\Projects\fullprof\MinGW64\bin;%PATH%
- set PATH=%PATH:C:\Program Files\Git\bin;=%
- set HDF5_INCLUDE_PATH=C:\\Projects\\fullprof\\hdf5-gfortran\\include
- set HDF5_INCLUDE_PATH=C:\\Projects\\fullprof\\hdf5-gfortran\\include\\shared
- set HDF5_LIBRARY_PATH=C:\\Projects\\fullprof\\hdf5-gfortran\\lib
- call "BuildServer\\Windows\\build.bat" gfortran
tags:
......@@ -131,7 +131,7 @@ make:windows_ifort:
stage: make
script:
- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
- set PATH=c:\Projects\fullprof\python37\;%PATH%
- set PATH=c:\Projects\fullprof\python37\;C:\\Projects\\fullprof\\hdf5-ifort\\bin;%PATH%
- set LIB="C:\\Program Files (x86)\\IntelSWTools\\compilers_and_libraries_2020.2.254\\windows\\compiler\\lib\\intel64_win";%LIB%
- set HDF5_INCLUDE_PATH=C:\\Projects\\fullprof\\hdf5-ifort\\include\\shared
- set HDF5_LIBRARY_PATH=C:\\Projects\\fullprof\\hdf5-ifort\\lib
......@@ -228,7 +228,7 @@ make_release:windows:
stage: make_release
script:
- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
- set PATH=c:\Projects\fullprof\python37;%PATH%
- set PATH=c:\Projects\fullprof\python37\;C:\\Projects\\fullprof\\hdf5-ifort\\bin;%PATH%
- set LIB="C:\\Program Files (x86)\\IntelSWTools\\compilers_and_libraries_2020.2.254\\windows\\compiler\\lib\\intel64_win";%LIB%
- set HDF5_INCLUDE_PATH=C:\\Projects\\fullprof\\hdf5-ifort\\include\\shared
- set HDF5_LIBRARY_PATH=C:\\Projects\\fullprof\\hdf5-ifort\\lib
......
......@@ -7,8 +7,11 @@ ARG CI_COMMIT_REF_NAME
ENV CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHORT_SHA}
ENV CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
ENV HDF5_INCLUDE_PATH=/hdf5/include
ENV HDF5_LIBRARY_PATH=/hdf5/lib
COPY ./ /app/
WORKDIR /app
CMD BuildServer/Unix/build.sh gfortran && cp -a build_gfortran /artifacts/
\ No newline at end of file
CMD BuildServer/Unix/build.sh gfortran && cp -a build_gfortran /artifacts/
#CMD apt-get install -y g++ && cd /hdf5 && ./configure --enable-fortran --prefix=/artifacts/hdf && make && make install
\ No newline at end of file
......@@ -3,8 +3,21 @@ FROM ubuntu:xenial
ENV https_proxy http://proxy.ill.fr:8888
ENV http_proxy http://proxy.ill.fr:8888
RUN apt-get update && apt-get install -y \
cmake \
gfortran \
python3 \
libhdf5-dev
\ No newline at end of file
# Install recent cmake (3.17) and gfortran-7
# https://askubuntu.com/questions/355565/how-do-i-install-the-latest-version-of-cmake-from-the-command-line
# https://askubuntu.com/questions/949308/how-do-i-install-gfortran-7
# So need to install software-properties-common to add kitware repo https://askubuntu.com/questions/493460/how-to-install-add-apt-repository-using-the-terminal
# So need to install apt-transport-https https://unix.stackexchange.com/questions/263801/apt-get-fails-the-method-driver-usr-lib-apt-methods-https-could-not-be-found
RUN apt-get update && apt-get install -y python3 \
libaec-dev \
libz-dev \
libsz2 && \
apt-get install -y wget \
software-properties-common \
apt-transport-https && \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' && \
apt-get update && apt-get install -y cmake && \
add-apt-repository ppa:ubuntu-toolchain-r/test && \
apt-get update && apt-get install -y gfortran-7 && \
ln -f -s /usr/bin/gfortran-7 /usr/bin/gfortran
......@@ -13,4 +13,5 @@ ENV HDF5_LIBRARY_PATH=/hdf5/lib
COPY ./ /app/
WORKDIR /app
CMD BuildServer/Unix/build.sh ifort && cp -a build_ifort /artifacts/
\ No newline at end of file
CMD BuildServer/Unix/build.sh ifort && cp -a build_ifort /artifacts/
#CMD apt-get install -y g++ && export FC=/opt/intel/bin/ifort && cd /hdf5 && ./configure --enable-fortran --prefix=/artifacts/hdf && make && make install
\ No newline at end of file
......@@ -4,17 +4,19 @@ ENV https_proxy http://proxy.ill.fr:8888
ENV http_proxy http://proxy.ill.fr:8888
ENV PATH=/opt/intel/bin:$PATH
ENV LD_LIBRARY_PATH=/opt/intel/lib/intel64
# Install recent cmake (3.17)
# https://askubuntu.com/questions/355565/how-do-i-install-the-latest-version-of-cmake-from-the-command-line
# So need to install software-properties-common to add kitware repo https://askubuntu.com/questions/493460/how-to-install-add-apt-repository-using-the-terminal
# So need to install apt-transport-https https://unix.stackexchange.com/questions/263801/apt-get-fails-the-method-driver-usr-lib-apt-methods-https-could-not-be-found
RUN apt-get update && \
apt-get install -y wget && \
apt-get install -y software-properties-common && \
apt-get install -y apt-transport-https && \
RUN apt-get update && apt-get install -y python3 \
libaec-dev \
libz-dev \
libsz2 && \
apt-get install -y wget \
software-properties-common \
apt-transport-https && \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' &&\
apt-get update && \
apt-get install -y cmake \
python3
\ No newline at end of file
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' && \
apt-get update && apt-get install -y cmake
......@@ -8,7 +8,7 @@ cd build_%compiler%
if %compiler% neq gfortran (
cmake -G "NMake Makefiles" -D ARCH32=OFF -D CMAKE_BUILD_TYPE=Debug -D CMAKE_Fortran_COMPILER=%compiler% -D HEAP_ARRAYS=ON -D USE_HDF=ON -D HDF5_INCLUDE_PATH=%HDF5_INCLUDE_PATH% -D HDF5_LIBRARY_PATH=%HDF5_LIBRARY_PATH% ..
) else (
cmake -G "MinGW Makefiles" -D ARCH32=OFF -D CMAKE_BUILD_TYPE=Debug -D CMAKE_Fortran_COMPILER=%compiler% -D USE_HDF=OFF -D HDF5_INCLUDE_PATH=%HDF5_INCLUDE_PATH% -D HDF5_LIBRARY_PATH=%HDF5_LIBRARY_PATH% ..
cmake -G "MinGW Makefiles" -D ARCH32=OFF -D CMAKE_BUILD_TYPE=Debug -D CMAKE_Fortran_COMPILER=%compiler% -D USE_HDF=ON -D HDF5_INCLUDE_PATH=%HDF5_INCLUDE_PATH% -D HDF5_LIBRARY_PATH=%HDF5_LIBRARY_PATH% ..
)
cmake --build .
ctest
ctest
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment