Update build-package workflow

.github/workflows/build-package.yml

@@ -31,8 +31,8 @@ jobs:
           # - clang
         include:
           - cc: gcc
-            LDFLAGS: ''
-            CFLAGS: '-O2'
+            LDFLAGS: ""
+            CFLAGS: "-O2"
           # # Disable Clang (enable required: matrix.cc.clang)
           # - cc: clang
           #   # # Disable ASan, incompatible w/ Valgrind test
@@ -75,12 +75,40 @@ jobs:
             schaufel_*.buildinfo
             schaufel_*.changes
             schaufel_*.deb
+  release:
+    needs: build-deb-gcc
+    name: Debian-Package (${{ matrix.os }}, ${{ matrix.cc }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os:
+          - ubuntu-22.04
+          - ubuntu-24.04
+        cc:
+          - gcc
+          # # Disable Clang (enable required: matrix.include.cc: clang)
+          # - clang
+    env:
+      CC: ${{ matrix.cc }}
+      LDFLAGS: ${{ matrix.LDFLAGS }}
+      CFLAGS: ${{ matrix.CFLAGS }}
+    permissions:
+      contents: write
+      packages: write
+      actions: read
+    steps:
+      - name: Download Debian package
+        uses: actions/download-artifact@v4
+        with:
+          name: Packages-${{ matrix.os }}
 
       - name: Release package(s)
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             schaufel_*.buildinfo
             schaufel_*.changes
             schaufel_*.deb
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test-pr.yml

@@ -4,17 +4,15 @@ name: Test Schaufel
 # Run this workflow every time a new commit pushed to your repository
 on:
   pull_request:
-    #branches: '**'
-    #branches-ignore: 'main'
+    # branches: '**'
+    # branches-ignore: 'main'
 
   workflow_dispatch:
 
-
 defaults:
   run:
     shell: bash
 
-
 jobs:
   pr-test-ubuntu:
     name: Test Schaufel on Ubuntu
@@ -23,7 +21,6 @@ jobs:
       matrix:
         # also test 'latest', eventually this will be upgraded to a newer version and might fail early
         os:
-          - ubuntu-20.04
           - ubuntu-22.04
           - ubuntu-24.04
 

Makefile

@@ -100,5 +100,5 @@ package-deb: all
 	cd ../
 
 	for _extension in buildinfo changes deb; do \
-		mv schaufel_${SCHAUFEL_VERSION}_amd64.$${_extension} schaufel_${SCHAUFEL_VERSION}_${OS_ID}${OS_CODENAME}_amd64.$${_extension}; \
+		mv schaufel_${SCHAUFEL_VERSION}_amd64.$${_extension} schaufel_${SCHAUFEL_VERSION}_${OS_ID}_${OS_CODENAME}_amd64.$${_extension}; \
 	done