Skip to content

Commit 83463d8

Browse files
committed
fix(ci): pin Rust toolchain to 1.94.0 to match local dev
dtolnay/rust-toolchain@stable installs latest (1.95.0) which has new clippy lints (collapsible_match, unnecessary_sort_by, useless_conversion) not present in 1.94. Pin all ci-pr.yml jobs to 1.94.0 and update rust-toolchain.toml accordingly. Refs #576
1 parent bbc7ec1 commit 83463d8

2 files changed

Lines changed: 2 additions & 84 deletions

File tree

.github/rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[toolchain]
55
# Stable Rust version with edition 2024 support
6-
channel = "1.87.0"
6+
channel = "1.94.0"
77

88
# Components needed for the project
99
components = ["rustfmt", "clippy"]

.github/workflows/ci-pr.yml

Lines changed: 1 addition & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -181,89 +181,7 @@ jobs:
181181
- name: Install Rust toolchain
182182
uses: dtolnay/rust-toolchain@stable
183183
with:
184-
components: rustfmt
185-
186-
- name: Rustfmt Check
187-
run: cargo fmt --all -- --check
188-
189-
rust-clippy:
190-
name: Rust Clippy
191-
runs-on: [self-hosted, Linux, X64]
192-
timeout-minutes: 5
193-
needs: [changes]
194-
if: needs.changes.outputs.rust-changed == 'true'
195-
196-
steps:
197-
- name: Fix workspace permissions
198-
run: |
199-
WORKDIR="${GITHUB_WORKSPACE:-$PWD}"
200-
sudo chown -R $(id -u):$(id -g) "${WORKDIR}" 2>/dev/null || true
201-
sudo chmod -R u+rw "${WORKDIR}" 2>/dev/null || true
202-
203-
- name: Pre-checkout cleanup
204-
run: |
205-
WORKDIR="${GITHUB_WORKSPACE:-$PWD}"
206-
sudo rm -rf "${WORKDIR}/target" || true
207-
208-
- name: Checkout
209-
uses: actions/checkout@v6
210-
211-
- name: Disk cleanup
212-
run: |
213-
sudo rm -rf ~/.rustup/tmp/* 2>/dev/null || true
214-
sudo docker system prune -f 2>/dev/null || true
215-
df -h
216-
217-
- name: Install Rust toolchain
218-
uses: dtolnay/rust-toolchain@stable
219-
with:
220-
components: clippy
221-
222-
- name: Setup sccache
223-
uses: mozilla-actions/sccache-action@v0.0.9
224-
225-
- name: Configure sccache
226-
run: |
227-
echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
228-
echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
229-
230-
- name: Clippy Check
231-
run: cargo clippy --workspace --all-targets --features zlob -- -D warnings
232-
env:
233-
RUST_BACKTRACE: 1
234-
235-
# Quick Rust compilation check
236-
rust-compile:
237-
name: Rust Compilation Check
238-
runs-on: [self-hosted, Linux, X64]
239-
timeout-minutes: 6
240-
needs: [changes]
241-
if: needs.changes.outputs.rust-changed == 'true'
242-
243-
steps:
244-
- name: Fix workspace permissions
245-
run: |
246-
WORKDIR="${GITHUB_WORKSPACE:-$PWD}"
247-
sudo chown -R $(id -u):$(id -g) "${WORKDIR}" 2>/dev/null || true
248-
sudo chmod -R u+rw "${WORKDIR}" 2>/dev/null || true
249-
250-
- name: Pre-checkout cleanup
251-
run: |
252-
WORKDIR="${GITHUB_WORKSPACE:-$PWD}"
253-
sudo rm -rf "${WORKDIR}/target" || true
254-
255-
- name: Checkout
256-
uses: actions/checkout@v6
257-
258-
- name: Disk cleanup
259-
run: |
260-
sudo rm -rf ~/.rustup/tmp/* 2>/dev/null || true
261-
sudo docker system prune -f 2>/dev/null || true
262-
df -h
263-
264-
- name: Install Rust toolchain
265-
uses: dtolnay/rust-toolchain@stable
266-
with:
184+
toolchain: "1.94.0"
267185
components: rustfmt, clippy
268186

269187
- name: Setup sccache

0 commit comments

Comments
 (0)