Skip to content

Commit 0b04de5

Browse files
authored
Merge pull request #489 from newAM/rm-actions-rs
CI: actions-rs/toolchain -> dtolnay/rust-toolchain
2 parents fc2c6cc + fa7031a commit 0b04de5

File tree

6 files changed

+11
-39
lines changed

6 files changed

+11
-39
lines changed

.github/workflows/ci.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ jobs:
2525
experimental: true
2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: actions-rs/toolchain@v1
28+
- uses: dtolnay/rust-toolchain@master
2929
with:
30-
profile: minimal
3130
toolchain: ${{ matrix.rust }}
32-
override: true
3331
- name: Run tests
3432
run: cargo test --all --exclude cortex-m-rt --exclude testsuite --features cortex-m/critical-section-single-core
3533

.github/workflows/clippy.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ jobs:
1616
ref: refs/pull/${{ github.event.number }}/head
1717
- uses: actions/checkout@v4
1818
if: github.event_name != 'pull_request_target'
19-
- uses: actions-rs/toolchain@v1
19+
- uses: dtolnay/rust-toolchain@stable
2020
with:
21-
profile: minimal
22-
toolchain: stable
23-
override: true
2421
components: clippy
2522
- uses: actions-rs/clippy-check@v1
2623
with:

.github/workflows/cron.yml

+2-10
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: actions-rs/toolchain@v1
14-
with:
15-
profile: minimal
16-
toolchain: stable
17-
override: true
13+
- uses: dtolnay/rust-toolchain@stable
1814
- name: Run tests
1915
run: cargo test --all --exclude cortex-m-rt --exclude testsuite
2016
- uses: imjohnbo/issue-bot@v3
@@ -37,11 +33,7 @@ jobs:
3733
working-directory: cortex-m-rt
3834
steps:
3935
- uses: actions/checkout@v4
40-
- uses: actions-rs/toolchain@v1
41-
with:
42-
profile: minimal
43-
toolchain: stable
44-
override: true
36+
- uses: dtolnay/rust-toolchain@stable
4537
- name: Install all Rust targets for stable
4638
run: rustup target install --toolchain=stable thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf thumbv8m.base-none-eabi thumbv8m.main-none-eabi thumbv8m.main-none-eabihf
4739
- name: Install qemu and gcc

.github/workflows/on-target.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
18-
- uses: actions-rs/toolchain@v1
18+
- uses: dtolnay/rust-toolchain@stable
1919
with:
20-
profile: minimal
21-
toolchain: stable
22-
override: true
23-
target: thumbv7m-none-eabi
20+
targets: thumbv7m-none-eabi
2421
- name: Build testsuite
2522
env:
2623
RUSTFLAGS: -C link-arg=-Tlink.x -D warnings
@@ -40,12 +37,9 @@ jobs:
4037
runs-on: ubuntu-latest
4138
steps:
4239
- uses: actions/checkout@v4
43-
- uses: actions-rs/toolchain@v1
40+
- uses: dtolnay/rust-toolchain@stable
4441
with:
45-
profile: minimal
46-
toolchain: stable
47-
override: true
48-
target: thumbv6m-none-eabi
42+
targets: thumbv6m-none-eabi
4943
- name: Modify linkerfile
5044
run: |
5145
sed -i 's/FLASH : ORIGIN = 0x00000000, LENGTH = 256K/FLASH : ORIGIN = 0x8000000, LENGTH = 128K/g' memory.x

.github/workflows/rt-ci.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ jobs:
2424
working-directory: cortex-m-rt
2525
steps:
2626
- uses: actions/checkout@v4
27-
- uses: actions-rs/toolchain@v1
27+
- uses: dtolnay/rust-toolchain@master
2828
with:
29-
profile: minimal
3029
toolchain: ${{ matrix.rust }}
31-
override: true
3230
- name: Install all Rust targets for ${{ matrix.rust }}
3331
run: rustup target install --toolchain=${{ matrix.rust }} thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf thumbv8m.base-none-eabi thumbv8m.main-none-eabi thumbv8m.main-none-eabihf
3432
- name: Install qemu and gcc
@@ -63,11 +61,7 @@ jobs:
6361
working-directory: cortex-m-rt
6462
steps:
6563
- uses: actions/checkout@v4
66-
- uses: actions-rs/toolchain@v1
67-
with:
68-
profile: minimal
69-
toolchain: stable
70-
override: true
64+
- uses: dtolnay/rust-toolchain@stable
7165
- name: Install all Rust targets
7266
run: rustup target install thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf thumbv8m.base-none-eabi thumbv8m.main-none-eabi thumbv8m.main-none-eabihf
7367
- name: Build examples for thumbv6m-none-eabi

.github/workflows/rustfmt.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v4
16-
- uses: actions-rs/toolchain@v1
16+
- uses: dtolnay/rust-toolchain@stable
1717
with:
18-
profile: minimal
19-
toolchain: stable
20-
override: true
2118
components: rustfmt
2219
- uses: actions-rs/cargo@v1
2320
with:

0 commit comments

Comments
 (0)