Integrate valgrind build matrix into one job

randombit · Jan 17, 2025 · 143c220 · 143c220
1 parent 7ab294c
commit 143c220
Showing 1 changed file with 10 additions and 28 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -170,22 +170,30 @@ jobs:
         compiler: ["clang", "gcc"]
         cxxflags: ["-O1", "-O2", "-O3"]
         target:   ["valgrind-ct-full"]
+        platform: ["ubuntu-24.04", "ubuntu-24.04-arm"]
+
+        exclude:
+          - platform: "ubuntu-25.04-arm"
+            cxxflags: "-O1"
 
         include:
           - compiler: clang
             cxxflags: ""              # default compilation flags
             target:   "valgrind-full" # memory bug detection
+            platform: "ubuntu-24.04"
           - compiler: clang
             cxxflags: "-Os"
             # Clang's -Os generated binary is fast enough to run the full test suite.
             target:   "valgrind-ct-full"
+            platform: "ubuntu-24.04"
           - compiler: gcc
             cxxflags: "-Os"
             # GCC with -Os generates a much slower binary, that won't finish
             # before timing out on GH Actions, so we run a reduced set of tests.
             target:   "valgrind-ct"
+            platform: "ubuntu-24.04"
 
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.platform }}
 
     steps:
       - uses: actions/checkout@v4
@@ -197,37 +205,11 @@ jobs:
         uses: ./.github/actions/setup-build-agent
         with:
           target: ${{ matrix.target }}
-          cache-key: linux-x86_64-${{ matrix.compiler }}-${{ matrix.target }}-${{ matrix.cxxflags }}
+          cache-key: ${{ matrix.platform }}-${{ matrix.compiler }}-${{ matrix.target }}-${{ matrix.cxxflags }}
 
       - name: Valgrind Checks
         run: python3 ./src/scripts/ci_build.py --make-tool=make --cc=${{ matrix.compiler }} --custom-optimization-flags="${{ matrix.cxxflags }}" ${{ matrix.target }}
 
-  valgrind_aarch64:
-    name: "valgrind"
-    strategy:
-      fail-fast: false
-
-      matrix:
-        compiler: ["clang", "gcc"]
-        cxxflags: ["-O2", "-O3"]
-
-    runs-on: ubuntu-24.04-arm
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Read Repository Configuration
-        uses: ./.github/actions/read-repo-config
-
-      - name: Setup Build Agent
-        uses: ./.github/actions/setup-build-agent
-        with:
-          target: valgrind-ct-full
-          cache-key: linux-aarch64-${{ matrix.compiler }}-valgrind-${{ matrix.cxxflags }}
-
-      - name: Valgrind Checks
-        run: python3 ./src/scripts/ci_build.py --make-tool=make --cc=${{ matrix.compiler }} --custom-optimization-flags="${{ matrix.cxxflags }}" valgrind-ct-full
-
   hybrid_tls_interop:
     name: "PQ/T TLS 1.3"