matrix strategy

Author: gquintard

.github/workflows/packages.yml

@@ -7,44 +7,22 @@ on:
 
 jobs:
   build_varnish:
-    name: Building Varnish (${{ matrix.dist }}:${{ matrix.release }} for ${{ matrix.arch }})
+    name: Building Varnish (${{ matrix.target }} for ${{ matrix.arch }})
     runs-on: ubuntu-latest
     strategy: &strategy
       fail-fast: false
       matrix:
-#        arch:
-#          - amd64
+        arch:
+          - amd64
 #          - arm64
-        include:
-          - dist: debian
-            release: trixie
-            pkg: deb
-          - dist: almalinux
-            release: 10
-            pkg: rpm
-#          - dist: debian
-#            release: bullseye
-#            pkg: deb
-#          - dist: debian
-#            release: bookworm
-#            pkg: deb
-#          - dist: ubuntu
-#            release: jammy
-#            pkg: deb
-#          - dist: ubuntu
-#            release: noble
-#            pkg: deb
-#
-#          - dist: almalinux
-#            release: 8
-#            pkg: rpm
-#          - dist: almalinux
-#            release: 9
-#            pkg: rpm
-#    
-#          - dist: amazonlinux
-#            release: 2023
-#            pkg: rpm
+        target:
+          - debian-bookworm-deb
+          - debian-bullseye-deb
+          - debian-trixie-deb
+          - almalinux-8-rpm
+          - almalinux-9-rpm
+          - almalinux-10-rpm
+          - amazonlinux-2023-rpm
     steps:
       - name: Checkout Code
         uses: actions/checkout@v5
@@ -62,11 +40,10 @@ jobs:
 
           mkdir -p packages
 
-          EXT=${{ matrix.pkg }}
-          ARCH=${{ matrix.arch }}
-          PARAM_ARCH=amd64
-          PARAM_DIST=${{ matrix.dist }}
-          PARAM_RELEASE=${{ matrix.release }}
+          PARAM_ARCH=${{ matrix.arch }}
+          PARAM_DIST=`echo ${{ matrix.target}} | cut -d- -f 1`
+          PARAM_RELEASE=`echo ${{ matrix.target }} | cut -d- -f 2`
+          EXT=`echo ${{ matrix.target }} | cut -d- -f 3`
 
           docker run \
             --rm \
@@ -82,29 +59,24 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: varnish-${{ matrix.dist }}-${{ matrix.release }}
+          name: varnish-${{ matrix.target }}
           path: packages/*/*/*
   build_vmod:
     needs: build_varnish
     runs-on: ubuntu-latest
-    name: Building varnish-modules (${{ matrix.dist }}:${{ matrix.release }} for ${{ matrix.arch }})
-    strategy: &strategy
+    name: Building varnish-modules (${{ matrix.target }} for ${{ matrix.arch }})
+    strategy:
       fail-fast: false
       matrix:
+        arch:
+          - amd64
+#          - arm64
+        target:
+          - debian-trixie-deb
+          - almalinux-10-rpm
         package:
           - varnish-modules
           - vmod-uuid
-#        arch:
-#          - amd64
-#          - arm64
-        include:
-          - dist: debian
-            release: trixie
-            pkg: deb
-          - dist: almalinux
-            release: 10
-            pkg: rpm
-
     steps:
       - name: Checkout Code
         uses: actions/checkout@v5
@@ -114,15 +86,14 @@ jobs:
       - name: Download a specific artifact
         uses: actions/download-artifact@v4
         with:
-          name: varnish-${{ matrix.dist }}-${{ matrix.release }}
+          name: varnish-${{ matrix.target }}
           path: packages
       - name: Build
         run: |
-          EXT=${{ matrix.pkg }}
-          PACKAGE=${{ matrix.package }}
-          PARAM_ARCH=amd64
-          PARAM_DIST=${{ matrix.dist }}
-          PARAM_RELEASE=${{ matrix.release }}
+          PARAM_ARCH=${{ matrix.arch }}
+          PARAM_DIST=`echo ${{ matrix.target}} | cut -d- -f 1`
+          PARAM_RELEASE=`echo ${{ matrix.target }} | cut -d- -f 2`
+          EXT=`echo ${{ matrix.target }} | cut -d- -f 3`
 
           ( cd $PACKAGE/; tar cvzf ../debian.tar.gz debian --dereference ; )
           ( cd $PACKAGE/; tar cvzf ../redhat.tar.gz redhat --dereference ; )