Skip to content

Commit 4533b81

Browse files
rust-toolchain: Pin to 1.69.0 (#38)
1 parent c6b55fc commit 4533b81

File tree

3 files changed

+17
-203
lines changed

3 files changed

+17
-203
lines changed

.github/workflows/firmware.yml

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,13 @@ env:
1010
jobs:
1111
building:
1212
name: Building
13-
continue-on-error: ${{ matrix.experimental || false }}
14-
strategy:
15-
matrix:
16-
# All generated code should be running on stable now
17-
# TODO: Also test nightly
18-
#rust: [nightly, stable]
19-
rust: [stable]
20-
#include:
21-
# # Nightly is only for reference and allowed to fail
22-
# - rust: nightly
23-
# experimental: true
24-
#os:
25-
# # Check compilation works on common OSes
26-
# # (i.e. no path issues)
27-
# # - macOS-latest
28-
# - ubuntu-latest
29-
# - windows-latest
30-
runs-on: [ubuntu-latest] #${{ matrix.os }}
13+
runs-on: [ubuntu-latest]
3114
steps:
3215
- uses: actions/checkout@v3
33-
- uses: dtolnay/rust-toolchain@master
34-
with:
35-
toolchain: ${{ matrix.rust }}
36-
target: thumbv6m-none-eabi
16+
17+
- name: Setup Rust toolchain
18+
run: rustup show
19+
3720
- run: cargo install flip-link
3821
- run: cargo build -p ledmatrix
3922
- run: cargo build -p b1display
@@ -65,10 +48,10 @@ jobs:
6548
- uses: actions/checkout@v3
6649
with:
6750
submodules: true
68-
- uses: dtolnay/rust-toolchain@stable
69-
with:
70-
components: clippy
71-
target: thumbv6m-none-eabi
51+
52+
- name: Setup Rust toolchain
53+
run: rustup show
54+
7255
- run: |
7356
cargo clippy -p b1display -- --deny=warnings
7457
cargo clippy -p c1minimal -- --deny=warnings
@@ -81,8 +64,8 @@ jobs:
8164
- uses: actions/checkout@v3
8265
with:
8366
submodules: true
84-
- uses: dtolnay/rust-toolchain@stable
85-
with:
86-
components: rustfmt
87-
target: thumbv6m-none-eabi
67+
68+
- name: Setup Rust toolchain
69+
run: rustup show
70+
8871
- run: cargo fmt --all -- --check

Cargo.lock

Lines changed: 0 additions & 173 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-toolchain.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[toolchain]
2+
channel = "1.69.0"
3+
targets = ["thumbv6m-none-eabi"]
4+
components = ["clippy", "rustfmt"]

0 commit comments

Comments
 (0)