diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29fdc03d8687093dd939f6fe127b6b37776096de..29167d820f3a0572f71dc9a8260c29ea673cda93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,7 +134,7 @@ include: CC: gcc CFLAGS: -g -O2 FC: gfortran - FCFLAGS: -g -O2 + FFLAGS: -g -O2 LIBCHECK_ROOT: ${CI_GITIGNORE_DIR}/libcheck LIBCHECK_URL: https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz LIBCHECK_SHA256: a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a @@ -204,41 +204,10 @@ include: paths: - ${LIBCHECK_ROOT} -.common_autotools: - extends: .common - variables: - CONFIG_EXTRA_ARGS: - MAKEFLAGS: --jobs=${JOB_COUNT} V=1 - AM_COLOR_TESTS: always - script: - - > - test -f ./configure || ./autogen.sh - - mkdir build && cd build - - > - ../configure - --enable-check - --with-check-root="${LIBCHECK_ROOT}" - --enable-python - --disable-maintainer-mode - --prefix="${INSTALL_PREFIX}" - ${CONFIG_EXTRA_ARGS} - - make --output-sync=target check AM_COLOR_TESTS=no TESTS= 2>&1 | tee "${BUILD_LOG}" - - make --silent --keep-going check - - make install - - make installcheck - - !reference [.common, script] - artifacts: - when: on_failure - paths: - - "**/config.log" - - "**/test-suite.log" - .common_cmake: extends: .common variables: CMAKE_EXTRA_ARGS: - # Cmake initializes Fortran compiler flags from FFLAGS: - FFLAGS: ${FCFLAGS} script: - mkdir build && cd build - > @@ -279,7 +248,7 @@ include: .check_gcc: variables: CFLAGS: -g -O2 -Wall -Wextra -pedantic - FCFLAGS: -g -O2 -Wall -Wextra -pedantic -fbounds-check + FFLAGS: -g -O2 -Wall -Wextra -pedantic -fbounds-check before_script: [] .check_intel: @@ -299,42 +268,23 @@ include: .check_nag: variables: FC: nagfor - FCFLAGS: -g -O2 -C=all + FFLAGS: -g -O2 -C=all # Ignore Questionable warnings: WARNINGS_AWK_SCRIPT: '!/^\[NAG Fortran Compiler normal termination/ && (/warning/ || /WARNING/ || /Warning/)' before_script: - module load nag/7.1-gcc-11.2.0 -Check with GCC 11.2.0 (Autotools): - extends: - - .common_autotools - - .check_gcc - before_script: - - !reference [.common_autotools, before_script] - - !reference [.check_gcc, before_script] - cache: - policy: pull-push - -Check with GCC 11.2.0 (CMake, Ninja): +Check with GCC 11.2.0 (Ninja): extends: - .common_cmake_ninja - .check_gcc before_script: - !reference [.common_cmake_ninja, before_script] - !reference [.check_gcc, before_script] + cache: + policy: pull-push -Check with Intel 2021.5.0 (Autotools): - extends: - - .common_autotools - - .check_intel - variables: - # Ignore the warning on a deprecated flag injected by libtool: - WARNINGS_AWK_SCRIPT: '!/-nofor_main/ && (/warning/ || /WARNING/ || /Warning/)' - before_script: - - !reference [.common_autotools, before_script] - - !reference [.check_intel, before_script] - -Check with Intel 2021.5.0 (CMake, Unix Makefiles): +Check with Intel 2021.5.0 (Unix Makefiles): extends: - .common_cmake_makefiles - .check_intel @@ -342,17 +292,7 @@ Check with Intel 2021.5.0 (CMake, Unix Makefiles): - !reference [.common_cmake_makefiles, before_script] - !reference [.check_intel, before_script] -Check with NVHPC 24.7 (Autotools): - extends: - - .common_autotools - - .check_nvhpc - before_script: - - !reference [.common_autotools, before_script] - - !reference [.check_nvhpc, before_script] - # Libtool does not know about NVHPC and its PIC flag: - - export FCFLAGS="$FCFLAGS -fpic" - -Check with NVHPC 24.7 (CMake, Ninja): +Check with NVHPC 24.7 (Ninja): extends: - .common_cmake_ninja - .check_nvhpc @@ -360,17 +300,7 @@ Check with NVHPC 24.7 (CMake, Ninja): - !reference [.common_cmake_ninja, before_script] - !reference [.check_nvhpc, before_script] -Check with NAG 7.1.7114 (Autotools): - extends: - - .common_autotools - - .check_nag - before_script: - - !reference [.common_autotools, before_script] - - !reference [.check_nag, before_script] - # nagfor is supposed to use non-default gcc: - - export FCFLAGS="-Wc=`which gcc` $FCFLAGS" - -Check with NAG 7.1.7114 (CMake, Unix Makefiles): +Check with NAG 7.1.7114 (Unix Makefiles): extends: - .common_cmake_makefiles - .check_nag