Skip to content

Commit fb3db5c

Browse files
Merge pull request #8 from Spacecraft-Software/ci-pin-toolchain
ci: pin the Rust toolchain to 1.95.0 instead of floating stable
2 parents 23b00f7 + eaecabc commit fb3db5c

2 files changed

Lines changed: 19 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on:
1010
env:
1111
CARGO_TERM_COLOR: always
1212
RUSTFLAGS: "-D warnings"
13+
# Pin the toolchain so CI matches local dev (no rustup here — the dev box is
14+
# Nix-pinned at this version) and clippy/rustfmt can't drift ahead on the
15+
# runner. Keep in sync with rust-toolchain.toml; bump both together.
16+
RUST_TOOLCHAIN: "1.95.0"
1317

1418
jobs:
1519
fmt:
@@ -19,6 +23,7 @@ jobs:
1923
- uses: actions/checkout@v5
2024
- uses: dtolnay/rust-toolchain@stable
2125
with:
26+
toolchain: ${{ env.RUST_TOOLCHAIN }}
2227
components: rustfmt
2328
- run: cargo fmt --all -- --check
2429

@@ -29,6 +34,7 @@ jobs:
2934
- uses: actions/checkout@v5
3035
- uses: dtolnay/rust-toolchain@stable
3136
with:
37+
toolchain: ${{ env.RUST_TOOLCHAIN }}
3238
components: clippy
3339
- uses: Swatinem/rust-cache@v2
3440
- run: cargo clippy --workspace --all-targets --all-features -- -D warnings
@@ -43,6 +49,8 @@ jobs:
4349
steps:
4450
- uses: actions/checkout@v5
4551
- uses: dtolnay/rust-toolchain@stable
52+
with:
53+
toolchain: ${{ env.RUST_TOOLCHAIN }}
4654
- uses: Swatinem/rust-cache@v2
4755
- run: cargo build --workspace --all-targets
4856
- run: cargo test --workspace --all-targets
@@ -53,6 +61,8 @@ jobs:
5361
steps:
5462
- uses: actions/checkout@v5
5563
- uses: dtolnay/rust-toolchain@stable
64+
with:
65+
toolchain: ${{ env.RUST_TOOLCHAIN }}
5666
- uses: Swatinem/rust-cache@v2
5767
# PRD G6: the server install path must keep building — the CLI behind
5868
# its `cli` feature gate, and the agent without the clipboard's
@@ -66,6 +76,8 @@ jobs:
6676
steps:
6777
- uses: actions/checkout@v5
6878
- uses: dtolnay/rust-toolchain@stable
79+
with:
80+
toolchain: ${{ env.RUST_TOOLCHAIN }}
6981
- uses: Swatinem/rust-cache@v2
7082
- run: cargo build --bin vault --release
7183
- name: Verify attribution block
@@ -88,6 +100,8 @@ jobs:
88100
steps:
89101
- uses: actions/checkout@v5
90102
- uses: dtolnay/rust-toolchain@stable
103+
with:
104+
toolchain: ${{ env.RUST_TOOLCHAIN }}
91105
- uses: rustsec/audit-check@v2
92106
with:
93107
token: ${{ secrets.GITHUB_TOKEN }}

rust-toolchain.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# SPDX-License-Identifier: GPL-3.0-or-later
2+
# Pinned (not "stable") so CI and local dev run the *same* clippy/rustfmt and
3+
# lints can't appear only on the runner. Keep this in sync with
4+
# RUST_TOOLCHAIN in .github/workflows/ci.yml; bump both together (and the dev
5+
# environment) in a dedicated change.
26
[toolchain]
3-
channel = "stable"
7+
channel = "1.95.0"
48
components = ["rustfmt", "clippy"]
59
profile = "minimal"

0 commit comments

Comments
 (0)