From 384fc896e9114fbcd4129515259161ec9d96247c Mon Sep 17 00:00:00 2001 From: samypr100 <3933065+samypr100@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:39:04 -0400 Subject: [PATCH] Revert "Replace `cargo xwin clippy` with native clippy run on Windows temporarily (#8181)" This reverts commit 581fab659765b89c40be761048d5be5a62d4a221. --- .github/workflows/ci.yml | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e2b89826..cde063955 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,30 +108,36 @@ jobs: - name: "Clippy" run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings - cargo-clippy-windows: - timeout-minutes: 15 + cargo-clippy-xwin: + timeout-minutes: 10 needs: determine_changes if: ${{ github.repository == 'astral-sh/uv' && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }} - runs-on: - labels: "windows-latest-xlarge" + runs-on: ubuntu-latest name: "cargo clippy | windows" steps: - uses: actions/checkout@v4 - - uses: Swatinem/rust-cache@v2 - - - name: Create Dev Drive using ReFS - run: ${{ github.workspace }}/.github/workflows/setup-dev-drive.ps1 - - # actions/checkout does not let us clone into anywhere outside ${{ github.workspace }}, so we have to copy the clone... - - name: Copy Git Repo to Dev Drive - run: | - Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.UV_WORKSPACE }}" -Recurse - + - name: Load xwin cache + uses: actions/cache@v4 + with: + path: "${{ github.workspace}}/.xwin" + key: cargo-xwin-x86_64 + - name: Load rust cache + uses: Swatinem/rust-cache@v2 + with: + save-if: ${{ github.ref == 'refs/heads/main' }} - name: "Install Rust toolchain" - run: rustup component add clippy - + run: rustup target add x86_64-pc-windows-msvc + - name: "Install cargo-xwin" + uses: taiki-e/install-action@v2 + with: + tool: cargo-xwin + - name: Install xwin dependencies + run: sudo apt-get install --no-install-recommends -y lld llvm clang cmake ninja-build - name: "Clippy" - run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings + run: cargo xwin clippy --target x86_64-pc-windows-msvc --workspace --all-targets --all-features --locked --profile fast-build -- -D warnings + env: + XWIN_ARCH: "x86_64" + XWIN_CACHE_DIR: "${{ github.workspace}}/.xwin" cargo-dev-generate-all: timeout-minutes: 10