Merge pull request #384 from ohearnk/github-workflow-optimizations-2

GitHub Workflow Enhancement Part 2
merzlab · Dec 5, 2024 · c4eae09 · c4eae09
2 parents 95ab96f + 7570798
commit c4eae09
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 2 deletions.
diff --git a/.github/workflows/build_test_mpi.yml b/.github/workflows/build_test_mpi.yml
@@ -17,6 +17,22 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install gfortran openmpi-bin openmpi-common libopenmpi-dev
+      - name: 'Log Softare Environment Configuration'
+        run: |
+          echo "Ubuntu version:"
+          cat /etc/os-release
+          echo
+          echo "Kernel version:"
+          uname -a
+          echo
+          echo "Glibc version:"
+          ldd --version
+          echo
+          echo "GCC (gfortran) version:"
+          gfortran --version
+          echo
+          echo "MPI version:"
+          mpirun --version
       - name: 'Configure MPI Version'
         run: ./configure --mpi --enablef --prefix $PWD/install gnu
       - name: 'Build and Install MPI Version Using 2 Jobs'
@@ -47,6 +63,25 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install gfortran cmake openmpi-bin openmpi-common libopenmpi-dev
+      - name: 'Log Softare Environment Configuration (CMake)'
+        run: |
+          echo "Ubuntu version:"
+          cat /etc/os-release
+          echo
+          echo "Kernel version:"
+          uname -a
+          echo
+          echo "Glibc version:"
+          ldd --version
+          echo
+          echo "GCC (gfortran) version:"
+          gfortran --version
+          echo
+          echo "MPI version:"
+          mpirun --version
+          echo
+          echo "CMake version:"
+          cmake --version
       - name: 'Configure MPI Version (CMake)'
         run: |
           mkdir build

diff --git a/.github/workflows/build_test_serial.yml b/.github/workflows/build_test_serial.yml
@@ -17,6 +17,21 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install gfortran parallel
+      - name: 'Log Softare Environment Configuration'
+        run: |
+          echo "Ubuntu version:"
+          cat /etc/os-release
+          echo
+          echo "Kernel version:"
+          uname -a
+          echo
+          ldd --version
+          echo
+          echo "GCC (gfortran) version:"
+          gfortran --version
+          echo
+          echo "GNU Parallel version:"
+          parallel --version
       - name: 'Configure Serial Version'
         run: ./configure --serial --enablef --prefix $PWD/install gnu
       - name: 'Build and Install Serial Version Using 2 Jobs'
@@ -47,6 +62,24 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install gfortran cmake parallel
+      - name: 'Log Softare Environment Configuration (CMake)'
+        run: |
+          echo "Ubuntu version:"
+          cat /etc/os-release
+          echo
+          echo "Kernel version:"
+          uname -a
+          echo
+          ldd --version
+          echo
+          echo "GCC (gfortran) version:"
+          gfortran --version
+          echo
+          echo "CMake version:"
+          cmake --version
+          echo
+          echo "GNU Parallel version:"
+          parallel --version
       - name: 'Configure Serial Version (CMake)'
         run: |
           mkdir build

diff --git a/tools/runtest b/tools/runtest
@@ -83,9 +83,9 @@ check_for_req_deps()
     fullpath=`which $prog`
     if [ ! -x "$fullpath" ]; then
       if [ ! -f "$fullpath" ]; then
-        echo "Error: $fullpath not found. Install this program to run this test script."
+        echo "Error: $prog not found. Install this program to run this test script."
       else
-        echo "Error: $fullpath found but not executable. Install this program to run this test script."
+        echo "Error: $prog found but not executable. Install this program to run this test script."
       fi
       exit 1;
     fi