Skip to content

Commit 384fc89

Browse files
committed
Revert "Replace cargo xwin clippy with native clippy run on Windows temporarily (astral-sh#8181)"
This reverts commit 581fab6.
1 parent cc9767c commit 384fc89

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -108,30 +108,36 @@ jobs:
108108
- name: "Clippy"
109109
run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings
110110

111-
cargo-clippy-windows:
112-
timeout-minutes: 15
111+
cargo-clippy-xwin:
112+
timeout-minutes: 10
113113
needs: determine_changes
114114
if: ${{ github.repository == 'astral-sh/uv' && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
115-
runs-on:
116-
labels: "windows-latest-xlarge"
115+
runs-on: ubuntu-latest
117116
name: "cargo clippy | windows"
118117
steps:
119118
- uses: actions/checkout@v4
120-
- uses: Swatinem/rust-cache@v2
121-
122-
- name: Create Dev Drive using ReFS
123-
run: ${{ github.workspace }}/.github/workflows/setup-dev-drive.ps1
124-
125-
# actions/checkout does not let us clone into anywhere outside ${{ github.workspace }}, so we have to copy the clone...
126-
- name: Copy Git Repo to Dev Drive
127-
run: |
128-
Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.UV_WORKSPACE }}" -Recurse
129-
119+
- name: Load xwin cache
120+
uses: actions/cache@v4
121+
with:
122+
path: "${{ github.workspace}}/.xwin"
123+
key: cargo-xwin-x86_64
124+
- name: Load rust cache
125+
uses: Swatinem/rust-cache@v2
126+
with:
127+
save-if: ${{ github.ref == 'refs/heads/main' }}
130128
- name: "Install Rust toolchain"
131-
run: rustup component add clippy
132-
129+
run: rustup target add x86_64-pc-windows-msvc
130+
- name: "Install cargo-xwin"
131+
uses: taiki-e/install-action@v2
132+
with:
133+
tool: cargo-xwin
134+
- name: Install xwin dependencies
135+
run: sudo apt-get install --no-install-recommends -y lld llvm clang cmake ninja-build
133136
- name: "Clippy"
134-
run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings
137+
run: cargo xwin clippy --target x86_64-pc-windows-msvc --workspace --all-targets --all-features --locked --profile fast-build -- -D warnings
138+
env:
139+
XWIN_ARCH: "x86_64"
140+
XWIN_CACHE_DIR: "${{ github.workspace}}/.xwin"
135141

136142
cargo-dev-generate-all:
137143
timeout-minutes: 10

0 commit comments

Comments
 (0)