Skip to content

Commit 5a3989c

Browse files
committed
Switch to GHMQ and update
1 parent a0d986b commit 5a3989c

File tree

4 files changed

+34
-53
lines changed

4 files changed

+34
-53
lines changed

.github/bors.toml

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

.github/workflows/ci.yml

Lines changed: 17 additions & 22 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: Continuous integration
79

@@ -13,37 +15,30 @@ jobs:
1315
strategy:
1416
fail-fast: false
1517
matrix:
16-
# All generated code should be running on stable now
1718
rust: [stable]
18-
19-
# The default target we're compiling on and for
20-
TARGET: [x86_64-unknown-linux-gnu, armv7-unknown-linux-gnueabihf]
19+
target: [x86_64-unknown-linux-gnu, armv7-unknown-linux-gnueabihf]
20+
features:
21+
- ''
22+
- 'async-tokio,gpio_cdev,gpio_sysfs,i2c,spi'
2123

2224
include:
23-
# Test MSRV
24-
- rust: 1.60.0
25-
TARGET: x86_64-unknown-linux-gnu
25+
- rust: 1.60.0 # MSRV
26+
target: x86_64-unknown-linux-gnu
2627

2728
# Test nightly but don't fail
2829
- rust: nightly
2930
experimental: true
30-
TARGET: x86_64-unknown-linux-gnu
31+
target: x86_64-unknown-linux-gnu
3132

3233
steps:
33-
- uses: actions/checkout@v2
34-
35-
- uses: actions-rs/toolchain@v1
34+
- uses: actions/checkout@v4
35+
- uses: dtolnay/rust-toolchain@master
3636
with:
37-
profile: minimal
3837
toolchain: ${{ matrix.rust }}
39-
target: ${{ matrix.TARGET }}
40-
override: true
38+
target: ${{ matrix.target }}
4139

4240
- name: Install armv7 libraries
43-
if: ${{ matrix.TARGET == 'armv7-unknown-linux-gnueabihf' }}
41+
if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
4442
run: sudo apt-get install -y libc6-armhf-cross libc6-dev-armhf-cross gcc-arm-linux-gnueabihf
4543

46-
- uses: actions-rs/cargo@v1
47-
with:
48-
command: check
49-
args: --target=${{ matrix.TARGET }}
44+
- run: cargo check --target=${{ matrix.target }} --features=${{ matrix.features }}

.github/workflows/clippy.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
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
jobs:
810
clippy_check:
911
runs-on: ubuntu-latest
1012
steps:
11-
- uses: actions/checkout@v2
12-
- uses: actions-rs/toolchain@v1
13+
- uses: actions/checkout@v4
14+
- uses: dtolnay/rust-toolchain@master
1315
with:
14-
profile: minimal
1516
toolchain: stable
16-
override: true
1717
components: clippy
18-
- uses: actions-rs/clippy-check@v1
19-
with:
20-
token: ${{ secrets.GITHUB_TOKEN }}
18+
- run: cargo clippy --all-features -- --deny=warnings

.github/workflows/rustfmt.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
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

810
jobs:
911
fmt:
10-
name: Rustfmt
1112
runs-on: ubuntu-latest
1213
steps:
13-
- uses: actions/checkout@v2
14-
- uses: actions-rs/toolchain@v1
14+
- uses: actions/checkout@v4
15+
- uses: dtolnay/rust-toolchain@master
1516
with:
16-
profile: minimal
17-
toolchain: stable
18-
override: true
17+
toolchain: nightly
1918
components: rustfmt
20-
- uses: actions-rs/cargo@v1
21-
with:
22-
command: fmt
23-
args: --all -- --check
19+
- run: cargo fmt --check

0 commit comments

Comments
 (0)