Skip to content

Commit 9a3ae43

Browse files
committed
use rust-toolchain.toml on CI
1 parent 248bd1d commit 9a3ae43

File tree

3 files changed

+8
-21
lines changed

3 files changed

+8
-21
lines changed

.github/workflows/rust-ci-extra-test.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ env:
2727
# Use a shared cache key for all jobs in the same PR/run. Note the usage of `../Cargo.lock` in invocations
2828
# below to check for any changed deps
2929
CACHE_KEY: "ci-${{ github.head_ref || github.ref_name }}"
30-
# Rust version for consistency across jobs
31-
RUST_VERSION: "1.88.0"
3230
# GitHub Container Registry
3331
GITHUB_REGISTRY: ghcr.io
3432

@@ -77,10 +75,7 @@ jobs:
7775

7876
- name: Install Rust toolchain
7977
if: steps.diff.outputs.run_tests == 'true'
80-
uses: dtolnay/rust-toolchain@stable
81-
with:
82-
toolchain: ${{ env.RUST_VERSION }}
83-
components: "cargo, rustc, clippy, llvm-tools, rustc-dev"
78+
run: rustup show
8479

8580
- name: Cache dependencies
8681
if: steps.diff.outputs.run_tests == 'true'

.github/workflows/rust-ci.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ env:
2424
# Use a shared cache key for all jobs in the same PR/run. Note the usage of `../Cargo.lock` in invocations
2525
# below to check for any changed deps
2626
CACHE_KEY: "ci-${{ github.head_ref || github.ref_name }}"
27-
# Rust version for consistency across jobs
28-
RUST_VERSION: "1.88.0"
2927

3028
jobs:
3129
taplo:
@@ -100,10 +98,7 @@ jobs:
10098
- uses: actions/checkout@v4
10199

102100
- name: Install Rust toolchain
103-
uses: dtolnay/rust-toolchain@stable
104-
with:
105-
toolchain: ${{ env.RUST_VERSION }}
106-
components: "cargo, rustc, clippy, llvm-tools, rustc-dev"
101+
run: rustup show
107102

108103
- name: Cache dependencies
109104
uses: Swatinem/rust-cache@v2
@@ -147,10 +142,7 @@ jobs:
147142
submodules: recursive
148143

149144
- name: Install Rust toolchain
150-
uses: dtolnay/rust-toolchain@stable
151-
with:
152-
toolchain: ${{ env.RUST_VERSION }}
153-
components: "cargo, rustc, clippy, llvm-tools, rustc-dev"
145+
run: rustup show
154146

155147
- name: Cache dependencies
156148
uses: Swatinem/rust-cache@v2

rust-toolchain.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[toolchain]
2-
channel = "stable"
3-
components = ["rustfmt", "clippy"]
2+
channel = "1.92"
3+
components = ["cargo", "clippy", "llvm-tools", "rustc", "rustc-dev"]
4+
profile = "default"
45
targets = [
5-
"aarch64-apple-darwin", # For M1 Mac
6-
"x86_64-unknown-linux-gnu" # For Linux server
6+
"aarch64-apple-darwin", # For M1 Mac
7+
"x86_64-unknown-linux-gnu", # For Linux server
78
]
8-
profile = "default"

0 commit comments

Comments
 (0)