Echo the path to and version of CMake for CI builds

This will help devs understand and reproduce problems, as well as
confirm that the intentions of the test configurations are honored.

Replaced one use of "cmake" with "$CMAKE" to standardize

diff --git a/admin/ci-scripts/gromacs-base-configure.sh b/admin/ci-scripts/gromacs-base-configure.sh
index 8baec4c8d3e006077496c31dbfb333582718659d..651126a4a41bda3c261667111f7eee328301c859 100755 (executable)
--- a/admin/ci-scripts/gromacs-base-configure.sh
+++ b/admin/ci-scripts/gromacs-base-configure.sh
@@ -16,6 +16,8 @@ else
       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 \

diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml
index 7d2af7a1e644b2bf4e4eca717a7ad144fc9fb664..71dee72decd343eb5f6b7ace034baed9e657fc30 100644 (file)
--- a/admin/gitlab-ci/gromacs.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml
@@ -54,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

diff --git a/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml
index f137ac945d09c84d27f943a8a44229871458b724..6b52e1fbace857c7f68455b152c07dfc90fefd2b 100644 (file)
--- a/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml
@@ -87,7 +87,9 @@
       mkdir $RELEASE_BUILD_DIR ;
       fi
     - cd $RELEASE_BUILD_DIR
-    - cmake ../$RELEASE_SOURCE/
+    - which $CMAKE
+    - $CMAKE --version
+    - $CMAKE ../$RELEASE_SOURCE/
       -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
       $CMAKE_COMPILER_SCRIPT
       $CMAKE_EXTRA_OPTIONS
@@ -125,6 +127,8 @@
   script:
     - CMAKE=${CMAKE:-$(which cmake)}
     - cd $BUILD_DIR
+    - which $CMAKE
+    - $CMAKE --version
     - scan-build -o scan_html $CMAKE --build . -- -j8 2>&1 | tee buildLogFile.log
     - awk '/warning/,/warning.*generated|^$/' buildLogFile.log
       | grep -v "CMake" | tee buildErrors.log || true

diff --git a/admin/gitlab-ci/lint.gitlab-ci.yml b/admin/gitlab-ci/lint.gitlab-ci.yml
index d5b43ad9b9ac869a43c36a84999e45b3bcae1272..623998101330bf77e82975b492746e869357b9f9 100644 (file)
--- a/admin/gitlab-ci/lint.gitlab-ci.yml
+++ b/admin/gitlab-ci/lint.gitlab-ci.yml
@@ -185,6 +185,8 @@ check-source:
   script:
     - CMAKE=${CMAKE:-$(which cmake)}
     - cd $BUILD_DIR
+    - which $CMAKE
+    - $CMAKE --version
     - $CMAKE --build . --target check-source
     - awk '/warning.*include style.*order/,/You can use.*rst|^$/' docs/doxygen/check-source.log | tee doxygenError.txt || true
     - awk '/warning:.*includes/,/unnecessarily|^$/' docs/doxygen/check-source.log | tee -a doxygenError.txt || true