From d043b17b33a2e6f4e5cfb8ead27ee9a40b27adb8 Mon Sep 17 00:00:00 2001
From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Tue, 2 Nov 2021 13:05:00 +0100
Subject: [PATCH] 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
---
 admin/ci-scripts/gromacs-base-configure.sh   | 2 ++
 admin/gitlab-ci/gromacs.gitlab-ci.yml        | 2 ++
 admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml | 6 +++++-
 admin/gitlab-ci/lint.gitlab-ci.yml           | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/admin/ci-scripts/gromacs-base-configure.sh b/admin/ci-scripts/gromacs-base-configure.sh
index 8baec4c8d3..651126a4a4 100755
--- 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 7d2af7a1e6..71dee72dec 100644
--- 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 f137ac945d..6b52e1fbac 100644
--- 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 d5b43ad9b9..6239981013 100644
--- 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
-- 
2.22.0