Use matrix for cargo check (RustPython#7388)

ShaharNaveh · youknowone · commit 0af70d4011e1 · 2026-03-20T05:01:19.000+09:00
* Use matrix for cargo_check

* Tweak `gcc-aarch64-linux-gnu` deps

* Re-add redox comment
diff --git a/.github/actions/install-linux-deps/action.yml b/.github/actions/install-linux-deps/action.yml
@@ -42,8 +42,8 @@ runs:
       run: >
         sudo apt-get update
 
-        sudo apt-get install
+        sudo apt-get install --no-install-recommends
         ${{ fromJSON(inputs.gcc-multilib) && 'gcc-multilib' || '' }}
         ${{ fromJSON(inputs.musl-tools) && 'musl-tools' || '' }}
         ${{ fromJSON(inputs.clang) && 'clang' || '' }}
-        ${{ fromJSON(inputs.gcc-aarch64-linux-gnu) && 'gcc-aarch64-linux-gnu' || '' }}
+        ${{ fromJSON(inputs.gcc-aarch64-linux-gnu) && 'gcc-aarch64-linux-gnu linux-libc-dev-arm64-cross libc6-dev-arm64-cross' || '' }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -188,94 +188,58 @@ jobs:
           PYTHONPATH: scripts
         if: runner.os == 'Linux'
 
-      - name: prepare Intel MacOS build
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          target: x86_64-apple-darwin
-        if: runner.os == 'macOS'
-      - name: Check compilation for Intel MacOS
-        run: cargo check --target x86_64-apple-darwin
-        if: runner.os == 'macOS'
-      - name: prepare iOS build
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          target: aarch64-apple-ios
-        if: runner.os == 'macOS'
-      - name: Check compilation for iOS
-        run: cargo check --target aarch64-apple-ios ${{ env.CARGO_ARGS_NO_SSL }}
-        if: runner.os == 'macOS'
-
-  exotic_targets:
+  cargo_check:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
     name: Ensure compilation on various targets
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include: 
+        - os: ubuntu-latest
+          targets:
+            - aarch64-linux-android
+            - i686-unknown-linux-gnu
+            - i686-unknown-linux-musl
+            - wasm32-wasip2
+            - x86_64-unknown-freebsd
+          dependencies:
+            gcc-multilib: true
+            musl-tools: true
+        - os: ubuntu-latest
+          targets:
+            - aarch64-unknown-linux-gnu
+          dependencies:
+            gcc-aarch64-linux-gnu: true # conflict with `gcc-multilib`
+        - os: macos-latest
+          targets:
+            - aarch64-apple-ios
+            - x86_64-apple-darwin
+      fail-fast: false
     steps:
-      - uses: actions/checkout@v6
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
-          target: i686-unknown-linux-gnu
+          persist-credentials: false
 
-      - name: Install gcc-multilib and musl-tools
-        uses: ./.github/actions/install-linux-deps
+      - uses: Swatinem/rust-cache@v2
         with:
-          gcc-multilib: true
-          musl-tools: true
+          prefix-key: v0-rust-${{ join(matrix.targets, '-') }}
 
-      - name: Check compilation for x86 32bit
-        run: cargo check --target i686-unknown-linux-gnu ${{ env.CARGO_ARGS_NO_SSL }}
+      - name: Install dependencies
+        uses: ./.github/actions/install-linux-deps
+        with: ${{ matrix.dependencies || fromJSON('{}') }}
 
       - uses: dtolnay/rust-toolchain@stable
         with:
-          target: aarch64-linux-android
+          targets: ${{ join(matrix.targets, ',') }}
 
       - name: Setup Android NDK
+        if: ${{ contains(matrix.targets, 'aarch64-linux-android') }}
         id: setup-ndk
         uses: nttld/setup-ndk@v1
         with:
           ndk-version: r27
           add-to-path: true
 
-      - name: Check compilation for android
-        run: cargo check --target aarch64-linux-android ${{ env.CARGO_ARGS_NO_SSL }}
-        env:
-          CC_aarch64_linux_android: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang
-          AR_aarch64_linux_android: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
-          CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang
-
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          target: aarch64-unknown-linux-gnu
-
-      - name: Install gcc-aarch64-linux-gnu
-        uses: ./.github/actions/install-linux-deps
-        with:
-          gcc-aarch64-linux-gnu: true
-
-      - name: Check compilation for aarch64 linux gnu
-        run: cargo check --target aarch64-unknown-linux-gnu ${{ env.CARGO_ARGS_NO_SSL }}
-
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          target: i686-unknown-linux-musl
-
-      - name: Check compilation for musl
-        run: cargo check --target i686-unknown-linux-musl ${{ env.CARGO_ARGS_NO_SSL }}
-
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          target: x86_64-unknown-freebsd
-
-      - name: Check compilation for freebsd
-        run: cargo check --target x86_64-unknown-freebsd ${{ env.CARGO_ARGS_NO_SSL }}
-
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          target: wasm32-wasip2
-
-      - name: Check compilation for wasip2
-        run: cargo check --target wasm32-wasip2 ${{ env.CARGO_ARGS_NO_SSL }}
-
       # - name: Prepare repository for redox compilation
       #   run: bash scripts/redox/uncomment-cargo.sh
       # - name: Check compilation for Redox
@@ -284,6 +248,19 @@ jobs:
       #     command: check
       #     args: --ignore-rust-version
 
+      - name: Check compilation
+        run: |
+          for target in ${{ join(matrix.targets, ' ') }}
+          do
+            echo "::group::${target}"
+            cargo check --target $target ${{ env.CARGO_ARGS_NO_SSL }}
+            echo "::endgroup::"
+          done
+        env:
+          CC_aarch64_linux_android: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang
+          AR_aarch64_linux_android: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
+          CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang
+
   snippets_cpython:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
     env:
