Skip to content

Commit fd59226

Browse files
committed
Update CI and switch to GHMQ
1 parent d9839fe commit fd59226

File tree

4 files changed

+40
-53
lines changed

4 files changed

+40
-53
lines changed

.github/bors.toml

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

.github/workflows/ci.yml

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,46 @@
11
on:
2-
push:
3-
branches: [ staging, trying, master ]
4-
pull_request:
2+
push: # Run CI for all branches except GitHub merge queue tmp branches
3+
branches-ignore:
4+
- "gh-readonly-queue/**"
5+
pull_request: # Run CI for PRs on any branch
6+
merge_group: # Run CI for the GitHub merge queue
57

68
name: Continuous integration
79

810
env:
9-
RUSTFLAGS: '-D warnings'
11+
RUSTFLAGS: '--deny warnings'
1012

1113
jobs:
1214
ci-linux:
1315
runs-on: ubuntu-latest
1416
strategy:
1517
matrix:
16-
# All generated code should be running on stable now
17-
rust: [stable]
18+
rust:
19+
- stable
20+
- 1.60.0 # MSRV
1821

19-
# The default target we're compiling on and for
20-
TARGET: [x86_64-unknown-linux-gnu]
22+
features:
23+
- ''
24+
- 'defmt-0-3'
2125

22-
include:
23-
# Test MSRV
24-
- rust: 1.60.0
25-
TARGET: x86_64-unknown-linux-gnu
26+
target:
27+
- x86_64-unknown-linux-gnu
28+
- thumbv6m-none-eabi
2629

30+
include:
2731
# Test nightly but don't fail
2832
- rust: nightly
33+
target: x86_64-unknown-linux-gnu
34+
features: ''
2935
experimental: true
30-
TARGET: x86_64-unknown-linux-gnu
3136

3237
steps:
3338
- uses: actions/checkout@v3
34-
- uses: actions-rs/toolchain@v1
39+
- uses: dtolnay/rust-toolchain@master
3540
with:
36-
profile: minimal
3741
toolchain: ${{ matrix.rust }}
38-
target: ${{ matrix.TARGET }}
39-
override: true
40-
- uses: actions-rs/cargo@v1
41-
with:
42-
command: check
43-
args: --target=${{ matrix.TARGET }}
44-
- uses: actions-rs/cargo@v1
45-
with:
46-
command: test
47-
args: --target=${{ matrix.TARGET }}
42+
target: ${{ matrix.target }}
43+
44+
- run: cargo check --target=${{ matrix.target }} --features=${{ matrix.features }}
45+
- run: cargo test --target=${{ matrix.target }} --features=${{ matrix.features }}
46+
if: contains(matrix.target, 'linux')

.github/workflows/clippy.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
on:
2-
push:
3-
branches: [ staging, trying, master ]
4-
pull_request:
2+
push: # Run CI for all branches except GitHub merge queue tmp branches
3+
branches-ignore:
4+
- "gh-readonly-queue/**"
5+
pull_request: # Run CI for PRs on any branch
6+
merge_group: # Run CI for the GitHub merge queue
57

68
name: Clippy check
79

@@ -13,12 +15,8 @@ jobs:
1315
runs-on: ubuntu-latest
1416
steps:
1517
- uses: actions/checkout@v3
16-
- uses: actions-rs/toolchain@v1
18+
- uses: dtolnay/rust-toolchain@master
1719
with:
18-
profile: minimal
19-
toolchain: stable
20-
override: true
20+
toolchain: 1.71.0
2121
components: clippy
22-
- uses: actions-rs/clippy-check@v1
23-
with:
24-
token: ${{ secrets.GITHUB_TOKEN }}
22+
- run: cargo clippy --all-targets --all-features

.github/workflows/rustfmt.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
on:
2-
push:
3-
branches: [ staging, trying, master ]
4-
pull_request:
2+
push: # Run CI for all branches except GitHub merge queue tmp branches
3+
branches-ignore:
4+
- "gh-readonly-queue/**"
5+
pull_request: # Run CI for PRs on any branch
6+
merge_group: # Run CI for the GitHub merge queue
57

68
name: Code formatting check
79

@@ -11,13 +13,8 @@ jobs:
1113
runs-on: ubuntu-latest
1214
steps:
1315
- uses: actions/checkout@v3
14-
- uses: actions-rs/toolchain@v1
16+
- uses: dtolnay/rust-toolchain@master
1517
with:
16-
profile: minimal
17-
toolchain: stable
18-
override: true
18+
toolchain: 1.71.0
1919
components: rustfmt
20-
- uses: actions-rs/cargo@v1
21-
with:
22-
command: fmt
23-
args: --all -- --check
20+
- run: cargo fmt --all -- --check

0 commit comments

Comments
 (0)