fixup! ci(github): expand matrix for latest cc

aws · May 21, 2024 · 7af9a32 · 7af9a32
1 parent b5e116a
commit 7af9a32
Showing 1 changed file with 14 additions and 44 deletions.
diff --git a/.github/workflows/distcheck.yaml b/.github/workflows/distcheck.yaml
@@ -1,8 +1,6 @@
 name: PR CI
 on: [push, pull_request]
 env:
-  GCC_LATEST: 13
-  LLVM_LATEST: 19
   APT_PACKAGES: >-
     build-essential
     git
@@ -101,6 +99,14 @@ jobs:
           - cuda
           - neuron
 
+        include:
+          - realcc: clang-19
+            cc: clang
+            cc-version: latest
+          - realcc: gcc-13
+            cc: gcc
+            cc-version: latest
+
         exclude:
           # fails with
           # > checking if __builtin_expect is available... no
@@ -140,33 +146,12 @@ jobs:
           packages: liblttng-ust-dev
           version: lttng
 
-      - name: Install GCC
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        if: matrix.cc-version == 'legacy' && matrix.cc == 'gcc'
-        with:
-          packages: gcc
-          version: compiler-${{ matrix.cc }}-${{ matrix.cc-version }}
-
-      - name: Install Latest GCC
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        if: matrix.cc-version == 'latest' && matrix.cc == 'gcc'
-        with:
-          packages: gcc-${{ env.GCC_LATEST }}
-          version: compiler-${{ matrix.cc }}-${{ matrix.cc-version }}
-
-      - name: Install Clang
+      - name: Install ${{ matrix.realcc || matrix.cc }}
         uses: awalsh128/cache-apt-pkgs-action@latest
-        if: matrix.cc-version == 'legacy' && matrix.cc == 'clang'
+        if: matrix.cc-version == 'latest'
         with:
-          packages: clang
-          version: compiler-${{ matrix.cc }}-${{ matrix.cc-version }}
-
-      - name: Install Latest Clang
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        if: matrix.cc-version == 'latest' && matrix.cc == 'clang'
-        with:
-          packages: clang-${{ env.LLVM_LATEST }}
-          version: compiler-${{ matrix.cc }}-${{ matrix.cc-version }}
+          packages: ${{ matrix.realcc || matrix.cc }}
+          version: compiler-${{ matrix.realcc || matrix.cc }}-${{ matrix.cc-version }}
 
       - name: Install Base Dependencies
         uses: awalsh128/cache-apt-pkgs-action@latest
@@ -196,15 +181,7 @@ jobs:
           pushd libfabric
           ./autogen.sh
 
-          export CC="${{ matrix.cc }}"
-          if [ "${{ matrix.cc-version }}" == "latest" ]; then
-             if [ "${{ matrix.cc }}" == "clang" ]; then
-                export CC="$CC-${{ env.LLVM_LATEST }}"
-             else
-                export CC="$CC-${{ env.GCC_LATEST }}"
-             fi
-          fi
-
+          export CC="${{ matrix.realcc || matrix.cc }}"
           ./configure --prefix="$PWD/install" \
                       --disable-sockets \
                       --disable-udp \
@@ -218,14 +195,7 @@ jobs:
         run: |
           set -x
 
-          export CC="${{ matrix.cc }}"
-          if [ "${{ matrix.cc-version }}" == "latest" ]; then
-             if [ "${{ matrix.cc }}" == "clang" ]; then
-                export CC="$CC-${{ env.LLVM_LATEST }}"
-             else
-                export CC="$CC-${{ env.GCC_LATEST }}"
-             fi
-          fi
+          export CC="${{ matrix.realcc || matrix.cc }}"
 
           # actions/checkout@v4 would drop the plugin source in $PWD,
           # so go ahead and build it.