From 74ed23e8214ab473058c3f02fd80129e386832d1 Mon Sep 17 00:00:00 2001
From: mcbarton <matthew.c.barton@hotmail.co.uk>
Date: Thu, 27 Nov 2025 21:07:41 +0000
Subject: [PATCH] Speed up ci

---
 .github/workflows/Ubuntu.yml | 68 +++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml
index 058c6de4..c18f06c3 100644
--- a/.github/workflows/Ubuntu.yml
+++ b/.github/workflows/Ubuntu.yml
@@ -22,44 +22,44 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: ubu22-x86-gcc12-clang-repl-19
-            os: ubuntu-22.04
+          - name: ubu24-x86-gcc12-clang-repl-19
+            os: ubuntu-24.04
             compiler: gcc-12
             clang-runtime: '19'
             cling: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu22-x86-gcc12-clang-repl-18
-            os: ubuntu-22.04
+          - name: ubu24-x86-gcc12-clang-repl-18
+            os: ubuntu-24.04
             compiler: gcc-12
             clang-runtime: '18'
             cling: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu22-x86-gcc9-clang18-cling
-            os: ubuntu-22.04
+          - name: ubu24-x86-gcc9-clang18-cling
+            os: ubuntu-24.04
             compiler: gcc-9
             clang-runtime: '18'
             cling: On
             cling-version: '1.2'
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu22-arm-gcc12-clang-repl-19
-            os: ubuntu-22.04-arm
+          - name: ubu24-arm-gcc12-clang-repl-19
+            os: ubuntu-24.04-arm
             compiler: gcc-12
             clang-runtime: '19'
             cling: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu22-arm-gcc12-clang-repl-18
-            os: ubuntu-22.04-arm
+          - name: ubu24-arm-gcc12-clang-repl-18
+            os: ubuntu-24.04-arm
             compiler: gcc-12
             clang-runtime: '18'
             cling: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu22-arm-gcc9-clang18-cling
-            os: ubuntu-22.04-arm
+          - name: ubu24-arm-gcc9-clang18-cling
+            os: ubuntu-24.04-arm
             compiler: gcc-9
             clang-runtime: '18'
             cling: On
@@ -245,44 +245,46 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: ubu22-x86-gcc12-clang-repl-19-cppyy
-            os: ubuntu-22.04
+          - name: ubu24-x86-gcc12-clang-repl-19-cppyy
+            os: ubuntu-24.04
             compiler: gcc-12
             clang-runtime: '19'
             cling: Off
             cppyy: On
-          - name: ubu22-x86-gcc12-clang-repl-18-cppyy
-            os: ubuntu-22.04
+            Valgrind: On
+          - name: ubu24-x86-gcc12-clang-repl-18-cppyy
+            os: ubuntu-24.04
             compiler: gcc-12
             clang-runtime: '18'
             cling: Off
             cppyy: On
-          - name: ubu22-x86-gcc9-clang18-cling-cppyy
-            os: ubuntu-22.04
+          - name: ubu24-x86-gcc9-clang18-cling-cppyy
+            os: ubuntu-24.04
             compiler: gcc-9
             clang-runtime: '18'
             cling: On
             cling-version: '1.2'
             cppyy: On
-          - name: ubu22-arm-gcc12-clang-repl-19
-            os: ubuntu-22.04-arm
+          - name: ubu24-arm-gcc12-clang-repl-19-cppyy
+            os: ubuntu-24.04-arm
             compiler: gcc-12
             clang-runtime: '19'
             cling: Off
-            cppyy: Off
-          - name: ubu22-arm-gcc12-clang-repl-18
-            os: ubuntu-22.04-arm
+            cppyy: On
+            Valgrind: On
+          - name: ubu24-arm-gcc12-clang-repl-18-cppyy
+            os: ubuntu-24.04-arm
             compiler: gcc-12
             clang-runtime: '18'
             cling: Off
-            cppyy: Off
-          - name: ubu22-arm-gcc9-clang18-cling-cppyy
-            os: ubuntu-22.04-arm
+            cppyy: On
+          - name: ubu24-arm-gcc9-clang18-cling-cppyy
+            os: ubuntu-24.04-arm
             compiler: gcc-9
             clang-runtime: '18'
             cling: On
             cling-version: '1.2'
-            cppyy: Off
+            cppyy: On
 
     steps:
     - uses: actions/checkout@v4
@@ -436,14 +438,6 @@ jobs:
                 -DLLVM_ENABLE_WERROR=On                      \
                 ../
         fi
-        docs_on=$(echo "${{ matrix.documentation }}" | tr '[:lower:]' '[:upper:]')
-        if [[ "${docs_on}" == "ON" ]]; then
-          cmake --build . --target doxygen-cppinterop --parallel ${{ env.ncpus }}
-          cmake --build . --target sphinx-cppinterop --parallel ${{ env.ncpus }}
-        else
-          cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }}
-          valgrind --show-error-list=yes --track-origins=yes --error-exitcode=1 unittests/CppInterOp/CppInterOpTests/unittests/bin/${{ env.BUILD_TYPE }}/CppInterOpTests
-        fi
         cd ..
         # We need CB_PYTHON_DIR later
         echo "CB_PYTHON_DIR=$CB_PYTHON_DIR" >> $GITHUB_ENV
@@ -573,7 +567,9 @@ jobs:
           SUPPRESSION_FILE="../etc/${CLANG_INTERPRETER}${CLANG_VERSION}-valgrind.supp"
         fi
         export IS_VALGRIND=true
-        valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -sv -ra
+        if [[ "${{ matrix.Valgrind }}" == "On" ]]; then
+           valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -sv -ra
+        fi
         unset IS_VALGRIND
         export RETCODE=+$?
         echo ::endgroup::