fix release CI steps

Author: 2bndy5

.github/workflows/binary-builds.yml

@@ -139,7 +139,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
-      - run: cargo package
+      - run: cargo package -p cpp-linter
       - name: Download built assets
         uses: actions/download-artifact@v4
         with:

.github/workflows/python-packaging.yml

@@ -1,3 +1,15 @@
+# This file was mostly autogenerated by maturin v1.7.1
+# To update, run
+#
+#    maturin generate-ci github --manifest-path py-binding/Cargo.toml
+#
+# NOTE: There are some customizations added to the generated output.
+# - workflow name is more descriptive
+# - use openssl-vendored cargo feature on
+#   * most cross-compiled Linux wheels
+#   * all MacOS builds
+# - muslinux builds (& x390 Linux target) are excluded due to complexity of
+#   installing openSSL lib in cross-compiler's docker/env.
 name: Python builds
 
 on:
@@ -22,17 +34,22 @@ env:
 
 jobs:
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.platform.runner }}
     strategy:
-      fail-fast: false
       matrix:
-        target:
-          - x86_64
-          - x86
-          - aarch64
-          - armv7
-          # - s390x
-          - ppc64le
+        platform:
+          - runner: ubuntu-latest
+            target: x86_64
+          - runner: ubuntu-latest
+            target: x86
+          - runner: ubuntu-latest
+            target: aarch64
+          - runner: ubuntu-latest
+            target: armv7
+          # - runner: ubuntu-latest
+          #   target: s390x
+          - runner: ubuntu-latest
+            target: ppc64le
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -43,7 +60,7 @@ jobs:
         shell: bash
         id: is-openssl-vendored
         run: |
-          if [[ "${{ startsWith(matrix.target, 'x86') }}" == "true" ]]; then
+          if [[ "${{ startsWith(matrix.platform.target, 'x86') }}" == "true" ]]; then
             echo "enabled=" >> $GITHUB_OUTPUT
           else
             echo "enabled=--features openssl-vendored" >> $GITHUB_OUTPUT
@@ -52,11 +69,12 @@ jobs:
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          target: ${{ matrix.target }}
-          args: --manifest-path py-binding/Cargo.toml --release --out dist --find-interpreter ${{ steps.is-openssl-vendored.outputs.enabled }}
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter --manifest-path py-binding/Cargo.toml ${{ steps.is-openssl-vendored.outputs.enabled }}
+          sccache: 'true'
           manylinux: auto
           before-script-linux: |
-            case "${{ matrix.target }}" in
+            case "${{ matrix.platform.target }}" in
               "aarch64" | "armv7" | "s390x" | "ppc64le")
                 # NOTE: pypa/manylinux docker images are Debian based
                 sudo apt-get update
@@ -71,38 +89,46 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-linux-${{ matrix.target }}
+          name: wheels-linux-${{ matrix.platform.target }}
           path: dist/*
 
   windows:
-    runs-on: windows-latest
+    runs-on: ${{ matrix.platform.runner }}
     strategy:
-      fail-fast: false
       matrix:
-        target: [x64, x86]
+        platform:
+          - runner: windows-latest
+            target: x64
+          - runner: windows-latest
+            target: x86
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
-          architecture: ${{ matrix.target }}
+          architecture: ${{ matrix.platform.target }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          target: ${{ matrix.target }}
-          args: --manifest-path py-binding/Cargo.toml --release --out dist --find-interpreter
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter --manifest-path py-binding/Cargo.toml
+          sccache: 'true'
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-windows-${{ matrix.target }}
+          name: wheels-windows-${{ matrix.platform.target }}
           path: dist/*
 
   macos:
-    runs-on: macos-latest
+    runs-on: ${{ matrix.platform.runner }}
     strategy:
       fail-fast: false
       matrix:
-        target: [x86_64, aarch64]
+        platform:
+          - runner: macos-12
+            target: x86_64
+          - runner: macos-14
+            target: aarch64
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -111,12 +137,13 @@ jobs:
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          target: ${{ matrix.target }}
-          args: --manifest-path py-binding/Cargo.toml --release --out dist --find-interpreter --features openssl-vendored
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter --manifest-path py-binding/Cargo.toml --features openssl-vendored
+          sccache: 'true'
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-macos-${{ matrix.target }}
+          name: wheels-macos-${{ matrix.platform.target }}
           path: dist/*
 
   sdist:
@@ -139,18 +166,17 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     needs: [linux, windows, macos, sdist]
+    permissions:
+      id-token: write
     steps:
       - uses: actions/download-artifact@v4
-        with:
-          path: dist
-      - run: mv dist/**/*.{whl,gz} dist/
       - name: Publish to PyPI
         uses: PyO3/maturin-action@v1
         env:
           # This workflow is registered as a trusted publisher (for test-pypi and pypi).
           # A token should not be required (and actually is discouraged with trusted publishers).
           # MATURIN_PYPI_TOKEN: ${{ contains(github.ref_name, 'rc') && secrets.TEST_PYPI_API_TOKEN || secrets.PYPI_API_TOKEN }}
-          MATURIN_REPOSITORY: ${{ contains(github.ref_name, 'rc') && 'test-pypi' || 'pypi' }}
+          MATURIN_REPOSITORY_URL: ${{ contains(github.ref_name, 'rc') && 'https://test.pypi.org/legacy' || 'https://upload.pypi.org/legacy' }}
         with:
           command: upload
-          args: --non-interactive --skip-existing dist/*
+          args: --non-interactive --skip-existing wheels-*/*