take 2

Author: bbqsrc

.github/workflows/ci.yml

@@ -7,12 +7,57 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
-        rust:
-          - stable
-          - beta
-          - nightly
-          - 1.86.0 # MSRV
+        include:
+          # Regular CI matrix for all Rust versions
+          - os: windows-latest
+            rust: stable
+          - os: windows-latest
+            rust: beta
+          - os: windows-latest
+            rust: nightly
+          - os: windows-latest
+            rust: 1.86.0 # MSRV
+          - os: ubuntu-latest
+            rust: stable
+          - os: ubuntu-latest
+            rust: beta
+          - os: ubuntu-latest
+            rust: nightly
+          - os: ubuntu-latest
+            rust: 1.86.0 # MSRV
+          - os: macos-latest
+            rust: stable
+          - os: macos-latest
+            rust: beta
+          - os: macos-latest
+            rust: nightly
+          - os: macos-latest
+            rust: 1.86.0 # MSRV
+          # Release artifact builds (stable only, with targets)
+          - os: ubuntu-latest
+            rust: stable
+            target: x86_64-unknown-linux-gnu
+            artifact_name: cargo-ndk_linux_x86_64
+          - os: ubuntu-latest
+            rust: stable
+            target: aarch64-unknown-linux-gnu
+            artifact_name: cargo-ndk_linux_aarch64
+          - os: macos-latest
+            rust: stable
+            target: x86_64-apple-darwin
+            artifact_name: cargo-ndk_macos_x86_64
+          - os: macos-latest
+            rust: stable
+            target: aarch64-apple-darwin
+            artifact_name: cargo-ndk_macos_aarch64
+          - os: windows-latest
+            rust: stable
+            target: x86_64-pc-windows-msvc
+            artifact_name: cargo-ndk_windows_x86_64
+          - os: windows-latest
+            rust: stable
+            target: aarch64-pc-windows-msvc
+            artifact_name: cargo-ndk_windows_arm64
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -26,8 +71,13 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          targets: aarch64-linux-android, armv7-linux-androideabi
+          targets: ${{ matrix.target && matrix.target || 'aarch64-linux-android,armv7-linux-androideabi' }}
           components: rustfmt, clippy
+      - name: Install cross-compilation dependencies (Linux aarch64)
+        if: matrix.target == 'aarch64-unknown-linux-gnu'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gcc-aarch64-linux-gnu
       - name: Run build
         run: cargo install --locked --path .
       - name: Smoke test `ndk-env`
@@ -50,86 +100,50 @@ jobs:
       - name: Run clippy
         continue-on-error: true
         run: cargo clippy -- -D warnings
-
-  build:
-    name: Build binaries
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          # Linux targets
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            artifact_name: cargo-ndk_linux_x86_64
-          - os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
-            artifact_name: cargo-ndk_linux_aarch64
-          # macOS targets
-          - os: macos-latest
-            target: x86_64-apple-darwin
-            artifact_name: cargo-ndk_macos_x86_64
-          - os: macos-latest
-            target: aarch64-apple-darwin
-            artifact_name: cargo-ndk_macos_aarch64
-          # Windows targets
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-            artifact_name: cargo-ndk_windows_x86_64
-          - os: windows-latest
-            target: aarch64-pc-windows-msvc
-            artifact_name: cargo-ndk_windows_arm64
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
-      - name: Install cross-compilation dependencies (Linux aarch64)
-        if: matrix.target == 'aarch64-unknown-linux-gnu'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-aarch64-linux-gnu
-      - name: Build binary
+      # Artifact creation steps (only for release builds with targets)
+      - name: Build release binary
+        if: matrix.target
         run: cargo build --release --target ${{ matrix.target }}
       - name: Create artifact directory
+        if: matrix.target
         run: mkdir -p artifacts
       - name: Copy binary (Unix)
-        if: runner.os != 'Windows'
+        if: matrix.target && runner.os != 'Windows'
         run: |
           cp target/${{ matrix.target }}/release/cargo-ndk artifacts/cargo-ndk
           cp target/${{ matrix.target }}/release/cargo-ndk-env artifacts/cargo-ndk-env
           cp target/${{ matrix.target }}/release/cargo-ndk-test artifacts/cargo-ndk-test
           cp target/${{ matrix.target }}/release/cargo-ndk-runner artifacts/cargo-ndk-runner
       - name: Copy binary (Windows)
-        if: runner.os == 'Windows'
+        if: matrix.target && runner.os == 'Windows'
         run: |
           cp target/${{ matrix.target }}/release/cargo-ndk.exe artifacts/cargo-ndk.exe
           cp target/${{ matrix.target }}/release/cargo-ndk-env.exe artifacts/cargo-ndk-env.exe
           cp target/${{ matrix.target }}/release/cargo-ndk-test.exe artifacts/cargo-ndk-test.exe
           cp target/${{ matrix.target }}/release/cargo-ndk-runner.exe artifacts/cargo-ndk-runner.exe
       - name: Get version
+        if: matrix.target
         id: version
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
       - name: Create tar.gz archive (Unix)
-        if: runner.os != 'Windows'
+        if: matrix.target && runner.os != 'Windows'
         run: |
           cd artifacts
           tar -czf ../${{ matrix.artifact_name }}_${{ steps.version.outputs.VERSION }}.tar.gz *
       - name: Create zip archive (Windows)
-        if: runner.os == 'Windows'
+        if: matrix.target && runner.os == 'Windows'
         run: |
           cd artifacts
           7z a -mx=9 ../${{ matrix.artifact_name }}_${{ steps.version.outputs.VERSION }}.zip *
       - name: Upload artifacts (Unix)
         uses: actions/upload-artifact@v4
-        if: runner.os != 'Windows' && startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '.')
+        if: matrix.target && runner.os != 'Windows' && startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '.')
         with:
           name: ${{ matrix.artifact_name }}_${{ steps.version.outputs.VERSION }}
           path: ${{ matrix.artifact_name }}_${{ steps.version.outputs.VERSION }}.tar.gz
       - name: Upload artifacts (Windows)
         uses: actions/upload-artifact@v4
-        if: runner.os == 'Windows' && startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '.')
+        if: matrix.target && runner.os == 'Windows' && startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '.')
         with:
           name: ${{ matrix.artifact_name }}_${{ steps.version.outputs.VERSION }}
           path: ${{ matrix.artifact_name }}_${{ steps.version.outputs.VERSION }}.zip