ci: workflow fixes

- Builds didn't include Bookworm ARM
- Fixed naming for release tags

Author: midwan

.github/workflows/c-cpp.yml

@@ -313,9 +313,11 @@ jobs:
           - name: bullseye
             image: midwan/amiberry-debian-x86_64:bullseye
             artifact_name: amiberry-debian-bullseye-amd64
+            release_name: debian-bullseye-amd64
           - name: bookworm
             image: midwan/amiberry-debian-x86_64:bookworm
             artifact_name: amiberry-debian-bookworm-amd64
+            release_name: debian-bookworm-amd64
     steps:
       - uses: actions/checkout@v4
 
@@ -337,7 +339,7 @@ jobs:
 
       - name: ZIP package for release
         if: github.ref_type == 'tag'
-        run: zip -r "amiberry-${{ github.ref_name }}-${{ matrix.artifact_name }}.zip" amiberry_*.deb
+        run: zip -r "amiberry-${{ github.ref_name }}-${{ matrix.release_name }}.zip" amiberry_*.deb
 
       - name: Upload artifact for release
         if: always() && github.ref_type == 'tag'
@@ -348,13 +350,24 @@ jobs:
 
   build-debian-arm64:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - name: bullseye
+            image: midwan/amiberry-debian-aarch64:bullseye
+            artifact_name: amiberry-debian-bullseye-arm64
+            release_name: debian-bullseye-arm64
+          - name: bookworm
+            image: midwan/amiberry-debian-aarch64:bookworm
+            artifact_name: amiberry-debian-bookworm-arm64
+            release_name: debian-bookworm-arm64
     steps:
     - uses: actions/checkout@v4
 
     - name: Run the build process with Docker
       uses: addnab/docker-run-action@v3
       with:
-        image: midwan/amiberry-debian-aarch64:bullseye
+        image: ${{ matrix.image }}
         options: -v ${{ github.workspace }}:/build
         run: |
           cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-aarch64-linux-gnu.cmake -B build -G Ninja -DCMAKE_INSTALL_PREFIX=/usr && cmake --build build -j4
@@ -364,29 +377,40 @@ jobs:
       if: always() && github.ref_type != 'tag'
       uses: actions/upload-artifact@v4
       with:
-        name: amiberry-debian-bullseye-arm64
-        path: amiberry_*.deb
+        name: ${{ matrix.image }}
+        path: "amiberry_*.deb"
 
     - name: ZIP package for release
       if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bullseye-arm64.zip amiberry_*.deb
+      run: zip -r amiberry-${{ github.ref_name }}-${{ matrix.release_name }}.zip amiberry_*.deb
 
     - name: Upload artifact for release
       if: always() && github.ref_type == 'tag'
       uses: actions/upload-artifact@v4
       with:
-          name: amiberry-debian-bullseye-arm64
-          path: amiberry-*.zip
+          name: ${{ matrix.artifact_name }}
+          path: "amiberry-*.zip"
 
   build-debian-armhf:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - name: bullseye
+            image: midwan/amiberry-debian-armhf:bullseye
+            artifact_name: amiberry-debian-bullseye-armhf
+            release_name: debian-bullseye-armhf
+          - name: bookworm
+            image: midwan/amiberry-debian-armhf:bookworm
+            artifact_name: amiberry-debian-bookworm-armhf
+            release_name: debian-bookworm-armhf
     steps:
     - uses: actions/checkout@v4
 
     - name: Run the build process with Docker
       uses: addnab/docker-run-action@v3
       with:
-        image: midwan/amiberry-debian-armhf:bullseye
+        image: ${{ matrix.image }}
         options: -v ${{ github.workspace }}:/build
         run: |
           cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-arm-linux-gnueabihf.cmake -B build -G Ninja -DCMAKE_INSTALL_PREFIX=/usr && cmake --build build -j4
@@ -396,19 +420,19 @@ jobs:
       if: always() && github.ref_type != 'tag'
       uses: actions/upload-artifact@v4
       with:
-        name: amiberry-debian-bullseye-armhf
-        path: amiberry_*.deb
+        name: ${{ matrix.artifact_name }}
+        path: "amiberry_*.deb"
 
     - name: ZIP package for release
       if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bullseye-armhf.zip amiberry_*.deb
+      run: zip -r amiberry-${{ github.ref_name }}-${{ matrix.release_name }}.zip amiberry_*.deb
 
     - name: Upload artifact for release
       if: always() && github.ref_type == 'tag'
       uses: actions/upload-artifact@v4
       with:
-          name: amiberry-debian-bullseye-armhf
-          path: amiberry-*.zip
+          name: ${{ matrix.artifact_name }}
+          path: "amiberry-*.zip"
 
   create-release:
     needs: [build-macOS-x86_64, build-macOS-Apple-Silicon, build-fedora-x86_64, build-ubuntu-24-amd64, build-ubuntu-22-amd64, build-debian-amd64, build-debian-arm64, build-debian-armhf]