Skip to content

Commit 4671c90

Browse files
authored
ci: run all clippy jobs on linux arm (#5306)
* ci: run all clippy jobs on linux arm * smoke test * Revert "smoke test" This reverts commit 8c64731.
1 parent 54536b8 commit 4671c90

File tree

1 file changed

+17
-69
lines changed

1 file changed

+17
-69
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -87,93 +87,41 @@ jobs:
8787
# Don't run clippy on `main` because it's already run in the merge queue.
8888
if: github.ref != 'refs/heads/main'
8989
needs: [fmt]
90-
runs-on: ${{ matrix.platform.os }}
90+
runs-on: ubuntu-24.04-arm
9191
strategy:
9292
# If one platform fails, allow the rest to keep testing if `CI-no-fail-fast` label is present
9393
fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
9494
matrix:
9595
rust: [stable]
96-
platform:
96+
target:
9797
[
98-
{
99-
os: "macos-latest",
100-
python-architecture: "arm64",
101-
rust-target: "aarch64-apple-darwin",
102-
},
103-
{
104-
os: "ubuntu-latest",
105-
python-architecture: "x64",
106-
rust-target: "x86_64-unknown-linux-gnu",
107-
},
108-
{
109-
os: "ubuntu-22.04-arm",
110-
python-architecture: "arm64",
111-
rust-target: "aarch64-unknown-linux-gnu",
112-
},
113-
{
114-
os: "ubuntu-latest",
115-
python-architecture: "x64",
116-
rust-target: "powerpc64le-unknown-linux-gnu",
117-
},
118-
{
119-
os: "ubuntu-latest",
120-
python-architecture: "x64",
121-
rust-target: "s390x-unknown-linux-gnu",
122-
},
123-
{
124-
os: "ubuntu-latest",
125-
python-architecture: "x64",
126-
rust-target: "wasm32-wasip1",
127-
},
128-
{
129-
os: "windows-latest",
130-
python-architecture: "x64",
131-
rust-target: "x86_64-pc-windows-msvc",
132-
},
133-
{
134-
os: "windows-latest",
135-
python-architecture: "x86",
136-
rust-target: "i686-pc-windows-msvc",
137-
},
138-
{
139-
os: "windows-11-arm",
140-
python-architecture: "arm64",
141-
rust-target: "aarch64-pc-windows-msvc",
142-
},
98+
"aarch64-apple-darwin",
99+
"x86_64-unknown-linux-gnu",
100+
"aarch64-unknown-linux-gnu",
101+
"powerpc64le-unknown-linux-gnu",
102+
"s390x-unknown-linux-gnu",
103+
"wasm32-wasip1",
104+
"x86_64-pc-windows-msvc",
105+
"i686-pc-windows-msvc",
106+
"aarch64-pc-windows-msvc",
143107
]
144108
include:
145109
# Run beta clippy as a way to detect any incoming lints which may affect downstream users
146110
- rust: beta
147-
platform:
148-
{
149-
os: "ubuntu-latest",
150-
python-architecture: "x64",
151-
rust-target: "x86_64-unknown-linux-gnu",
152-
}
153-
name: clippy/${{ matrix.platform.rust-target }}/${{ matrix.rust }}
111+
target: "x86_64-unknown-linux-gnu"
112+
name: clippy/${{ matrix.target }}/${{ matrix.rust }}
154113
continue-on-error: ${{ matrix.rust != 'stable' }}
155114
steps:
156115
- uses: actions/checkout@v4
157116
- uses: dtolnay/rust-toolchain@master
158117
with:
159118
toolchain: ${{ matrix.rust }}
160-
targets: ${{ matrix.platform.rust-target }}
119+
targets: ${{ matrix.target }}
161120
components: clippy,rust-src
162-
- uses: actions/setup-python@v5
163-
with:
164-
python-version: "3.13"
165-
architecture: ${{ matrix.platform.python-architecture }}
166-
# windows on arm image contains x86-64 libclang
167-
- name: Install LLVM and Clang
168-
if: matrix.platform.os == 'windows-11-arm'
169-
uses: KyleMayes/install-llvm-action@v2
170-
with:
171-
# to match windows-2022 images
172-
version: "18"
173-
- run: python -m pip install --upgrade pip && pip install nox
174-
- run: nox -s clippy-all
121+
- uses: astral-sh/setup-uv@v6
122+
- run: uvx nox -s clippy-all
175123
env:
176-
CARGO_BUILD_TARGET: ${{ matrix.platform.rust-target }}
124+
CARGO_BUILD_TARGET: ${{ matrix.target }}
177125

178126
build-pr:
179127
if: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-build-full') && github.event_name == 'pull_request' }}

0 commit comments

Comments
 (0)