release: use windows-2022, collapse Linux packaging into matrix

Author: fdcastel

.github/workflows/release.yml

@@ -41,7 +41,7 @@ jobs:
 
   package-windows:
     needs: [build-and-test, release]
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     strategy:
       matrix:
@@ -117,6 +117,14 @@ jobs:
     needs: [build-and-test, release]
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        include:
+          - artifact: linux-x64-binaries
+            suffix: linux-x64
+          - artifact: linux-arm64-binaries
+            suffix: linux-arm64
+
     steps:
     - uses: actions/checkout@v6
       with:
@@ -125,7 +133,7 @@ jobs:
     - name: Download Linux artifacts
       uses: actions/download-artifact@v8
       with:
-        name: linux-x64-binaries
+        name: ${{ matrix.artifact }}
         path: artifacts
 
     - name: Package Linux build
@@ -147,52 +155,10 @@ jobs:
         EOF
 
         cd "$packageDir"
-        tar -czf "../firebird-odbc-driver-${version}-linux-x64.tar.gz" *
-
-    - name: Upload release assets
-      uses: softprops/action-gh-release@v2
-      with:
-        files: |
-          firebird-odbc-driver-${{ needs.release.outputs.version }}-linux-x64.tar.gz
-
-  package-linux-arm64:
-    needs: [build-and-test, release]
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v6
-      with:
-        sparse-checkout: README.md
-
-    - name: Download Linux arm64 artifacts
-      uses: actions/download-artifact@v8
-      with:
-        name: linux-arm64-binaries
-        path: artifacts
-
-    - name: Package Linux arm64 build
-      run: |
-        version="${{ needs.release.outputs.version }}"
-        packageDir="package-linux-arm64"
-        mkdir -p "$packageDir"
-
-        cp artifacts/libOdbcFb.so "$packageDir/"
-
-        cp README.md "$packageDir/" 2>/dev/null || true
-
-        cat > "$packageDir/odbcinst.ini.sample" << 'EOF'
-        [Firebird ODBC Driver]
-        Description = Firebird ODBC Driver
-        Driver = /usr/local/lib/odbc/libOdbcFb.so
-        Setup = /usr/local/lib/odbc/libOdbcFb.so
-        FileUsage = 1
-        EOF
-
-        cd "$packageDir"
-        tar -czf "../firebird-odbc-driver-${version}-linux-arm64.tar.gz" *
+        tar -czf "../firebird-odbc-driver-${version}-${{ matrix.suffix }}.tar.gz" *
 
     - name: Upload release assets
       uses: softprops/action-gh-release@v2
       with:
         files: |
-          firebird-odbc-driver-${{ needs.release.outputs.version }}-linux-arm64.tar.gz
+          firebird-odbc-driver-${{ needs.release.outputs.version }}-${{ matrix.suffix }}.tar.gz