From 73b5b69bd881d1e7a77e28dca03367de23b46d22 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 1 May 2026 13:43:43 +0300 Subject: [PATCH] Cargo check features on all os (#7733) * Cargo check features on all os * Adjust cargo conf * Skip unsupported ssl platforms * zizmor * Remove duplicated check --- .github/workflows/ci.yaml | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1633336b0..5bdb17911 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -79,9 +79,6 @@ jobs: - name: run rust tests run: cargo test --workspace ${{ env.WORKSPACE_EXCLUDES }} --verbose --features threading ${{ env.CARGO_ARGS }} - - name: check compilation without threading - run: cargo check ${{ env.CARGO_ARGS }} - - run: cargo doc --locked if: runner.os == 'Linux' @@ -139,10 +136,12 @@ jobs: target: i686-unknown-linux-musl dependencies: musl-tools: true + skip_ssl: true - os: ubuntu-latest target: wasm32-wasip2 - os: ubuntu-latest target: x86_64-unknown-freebsd + skip_ssl: true - os: ubuntu-latest target: aarch64-unknown-linux-gnu dependencies: @@ -195,6 +194,20 @@ jobs: ndk-version: r27 add-to-path: true + - name: Append env conf to cargo + if: ${{ matrix.target == 'aarch64-linux-android' }} + env: + NDK_PATH: ${{ steps.setup-ndk.outputs.ndk-path }} + run: | + { + echo "[env]" + echo "CC_aarch64_linux_android = \"${NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang\"" + + echo "AR_aarch64_linux_android = \"${NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"" + + echo "CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER = \"${NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang\"" + } >> .cargo/config.toml + # - name: Prepare repository for redox compilation # run: bash scripts/redox/uncomment-cargo.sh # - name: Check compilation for Redox @@ -203,12 +216,12 @@ jobs: # command: check # args: --ignore-rust-version - - name: Check compilation - run: cargo check --target "${{ matrix.target }}" ${{ 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 + - name: Check compilation with threading + run: cargo check --target "${{ matrix.target }}" ${{ env.CARGO_ARGS_NO_SSL }} --features threading + + - name: Check compilation with ssl + if: ${{ !matrix.skip_ssl }} + run: cargo check --target "${{ matrix.target }}" ${{ env.CARGO_ARGS }} snippets_cpython: if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}