Echo the path to and version of CMake for CI builds

[alexxy/gromacs.git] / admin / gitlab-ci / gromacs.gitlab-ci.yml

diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml
index 55b0e1cd17dfc83e5b7da110979b097bf50b1bff..71dee72decd343eb5f6b7ace034baed9e657fc30 100644 (file)
--- a/admin/gitlab-ci/gromacs.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml
@@ -8,8 +8,8 @@
 #   SIMD: no
 #   Scope: configure, build, unit tests
 # Test implementation choices (free to change as needed):
-#   OS: Ubuntu 18.04
-#   Compiler: Clang 9
+#   OS: Ubuntu 20.04
+#   Compiler: Clang 12
 #   FFT: FFTW3
 #   Parallelism nt/ntomp: 4/2
 
@@ -21,7 +21,8 @@ simple-build:
     - .use-clang:base
     - .rules:basic-push
   stage: pre-build
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-9
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-12
+
   variables:
     CMAKE: /usr/local/cmake-3.16.3/bin/cmake
     KUBERNETES_CPU_LIMIT: 8
@@ -33,7 +34,7 @@ simple-build:
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=Debug"
     CMAKE_GPU_OPTIONS: "-DGMX_GPU=OFF"
     CMAKE_GMXAPI_OPTIONS: "-DGMX_PYTHON_PACKAGE=OFF"
-    COMPILER_MAJOR_VERSION: 9
+    COMPILER_MAJOR_VERSION: 12
     BUILD_DIR: simple-build
   script:
     - CMAKE=${CMAKE:-$(which cmake)}
@@ -53,6 +54,8 @@ simple-build:
       mkdir $BUILD_DIR ;
       fi
     - cd $BUILD_DIR
+    - which $CMAKE
+    - $CMAKE --version
     - $CMAKE ..
       -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
       $CMAKE_COMPILER_SCRIPT