Skip to content

Commit 3bc6ecc

Browse files
authored
Merge pull request #726 from rust-embedded/update-actions
update ci
2 parents 34b887d + a29b9d5 commit 3bc6ecc

File tree

4 files changed

+18
-58
lines changed

4 files changed

+18
-58
lines changed

.github/workflows/changelog.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
on:
22
pull_request_target:
3+
types: [labeled, unlabeled, opened, synchronize, reopened]
34

45
name: Changelog check
56

@@ -12,7 +13,7 @@ jobs:
1213
uses: actions/checkout@v3
1314

1415
- name: Changelog updated
15-
uses: Zomzog/changelog-checker@v1.2.0
16+
uses: Zomzog/changelog-checker@v1.3.0
1617
with:
1718
fileName: CHANGELOG.md
1819
env:

.github/workflows/ci.yml

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ jobs:
1010
name: CI
1111
runs-on: ubuntu-latest
1212
needs: [check, ci-linux, ci-clippy, ci-serde]
13+
if: always()
1314
steps:
1415
- name: Done
15-
run: exit 0
16+
run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
1617

1718
check:
18-
name: Cargo check
19+
name: Cargo check / clippy
1920
runs-on: ubuntu-latest
2021
strategy:
2122
matrix:
@@ -24,22 +25,18 @@ jobs:
2425
steps:
2526
- uses: actions/checkout@v3
2627

27-
- uses: actions-rs/toolchain@v1
28+
- uses: dtolnay/rust-toolchain@master
2829
with:
29-
profile: minimal
3030
toolchain: stable
31-
override: true
32-
target: ${{ matrix.TARGET }}
31+
targets: ${{ matrix.TARGET }}
32+
components: clippy
3333

3434
- name: Cache Dependencies
3535
uses: Swatinem/rust-cache@v2
3636
with:
3737
key: ${{ matrix.TARGET }}
3838

39-
- uses: actions-rs/cargo@v1
40-
with:
41-
command: check
42-
args: --target ${{ matrix.TARGET }}
39+
- run: cargo clippy --target ${{ matrix.TARGET }}
4340

4441
ci-linux:
4542
runs-on: ubuntu-latest
@@ -88,11 +85,9 @@ jobs:
8885
steps:
8986
- uses: actions/checkout@v3
9087

91-
- uses: actions-rs/toolchain@v1
88+
- uses: dtolnay/rust-toolchain@master
9289
with:
93-
profile: minimal
9490
toolchain: ${{ matrix.rust }}
95-
override: true
9691

9792
- name: Cache
9893
uses: Swatinem/rust-cache@v2
@@ -114,11 +109,9 @@ jobs:
114109
steps:
115110
- uses: actions/checkout@v3
116111

117-
- uses: actions-rs/toolchain@v1
112+
- uses: dtolnay/rust-toolchain@master
118113
with:
119-
profile: minimal
120114
toolchain: stable
121-
override: true
122115

123116
- name: Cache
124117
uses: Swatinem/rust-cache@v2
@@ -139,11 +132,9 @@ jobs:
139132
steps:
140133
- uses: actions/checkout@v3
141134

142-
- uses: actions-rs/toolchain@v1
135+
- uses: dtolnay/rust-toolchain@master
143136
with:
144-
profile: minimal
145137
toolchain: stable
146-
override: true
147138

148139
- name: Cache
149140
uses: Swatinem/rust-cache@v2
@@ -166,17 +157,12 @@ jobs:
166157
steps:
167158
- uses: actions/checkout@v3
168159

169-
- uses: actions-rs/toolchain@v1
160+
- uses: dtolnay/rust-toolchain@master
170161
with:
171-
profile: minimal
172162
toolchain: stable
173-
override: true
174163
components: rustfmt
175164

176165
- name: Cache Dependencies
177166
uses: Swatinem/rust-cache@v2
178167

179-
- uses: actions-rs/cargo@v1
180-
with:
181-
command: fmt
182-
args: --all -- --check
168+
- run: cargo fmt --all -- --check

.github/workflows/clippy.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,15 @@ jobs:
2727
runs-on: ${{ matrix.os }}
2828
steps:
2929
- uses: actions/checkout@v3
30-
- uses: actions-rs/toolchain@v1
30+
- uses: dtolnay/rust-toolchain@master
3131
with:
3232
toolchain: stable
33-
profile: minimal
34-
target: ${{ matrix.target }}
35-
override: true
33+
targets: ${{ matrix.target }}
3634
- name: Cache Dependencies
3735
uses: Swatinem/rust-cache@v2
3836
with:
3937
key: ${{ matrix.target }}
40-
- uses: actions-rs/cargo@v1
41-
with:
42-
command: build
43-
args: --target ${{ matrix.target }} --release
38+
- run: cargo build --target ${{ matrix.target }} --release
4439

4540
- name: Compress and rename executable
4641
if: ${{ matrix.os != 'windows-latest' }}
@@ -69,7 +64,7 @@ jobs:
6964
run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
7065

7166
- id: changelog-reader
72-
uses: mindsers/changelog-reader-action@v2.0.0
67+
uses: mindsers/changelog-reader-action@v2.2.2
7368
with:
7469
version: ${{ (github.ref_type == 'tag' && github.ref_name) || 'Unreleased' }}
7570

0 commit comments

Comments
 (0)