add back ubuntu 22.04 and include distro in filenames

Author: mnutt

.github/workflows/build-deb.yml

@@ -11,10 +11,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - ubuntu-22.04
+          - ubuntu-24.04
         varnish:
           - varnish77
           - varnish80
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
 
@@ -24,7 +27,7 @@ jobs:
     - name: Cache Rust dependencies
       uses: Swatinem/rust-cache@v2
       with:
-        prefix-key: ${{ matrix.varnish }}
+        prefix-key: ${{ matrix.os }}-${{ matrix.varnish }}
 
     - name: Install Varnish from packagecloud
       run: |
@@ -35,11 +38,24 @@ jobs:
     - name: Install cargo-deb
       run: cargo install cargo-deb
 
+    - name: Set distro codename
+      run: |
+        DISTRO_CODENAME=$(lsb_release -sc)
+        echo "DISTRO_CODENAME=$DISTRO_CODENAME" >> $GITHUB_ENV
+
     - name: Build Debian package
       run: cargo deb --variant=${{ matrix.varnish }}
 
+    - name: Rename package with distro codename
+      run: |
+        cd target/debian
+        ORIG_FILE=$(ls vmod-lambda-${{ matrix.varnish }}_*.deb)
+        NEW_FILE="${ORIG_FILE%.deb}_${DISTRO_CODENAME}.deb"
+        mv "$ORIG_FILE" "$NEW_FILE"
+        echo "DEB_FILE=$NEW_FILE" >> $GITHUB_ENV
+
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: vmod-lambda-${{ matrix.varnish }}.deb
-        path: target/debian/*.deb
+        name: vmod-lambda-${{ matrix.varnish }}-${{ env.DISTRO_CODENAME }}.deb
+        path: target/debian/${{ env.DEB_FILE }}

.github/workflows/test.yml

@@ -8,6 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          - ubuntu-22.04
           - ubuntu-24.04
         varnish:
           - varnish77
@@ -22,7 +23,7 @@ jobs:
     - name: Cache Rust dependencies
       uses: Swatinem/rust-cache@v2
       with:
-        prefix-key: ${{ matrix.varnish }}
+        prefix-key: ${{ matrix.os }}-${{ matrix.varnish }}
 
     - name: Install Varnish from packagecloud
       run: |