Skip to content

Commit 13cf030

Browse files
committed
Merge branch 'master' into feature/usb-device-bump
2 parents 2867684 + 4f1e219 commit 13cf030

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name: CI
77

88
jobs:
99
ci-linux:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111
continue-on-error: ${{ matrix.experimental || false }}
1212
strategy:
1313
matrix:
@@ -18,12 +18,10 @@ jobs:
1818
experimental: true
1919

2020
steps:
21-
- uses: actions/checkout@v2
22-
- uses: actions-rs/toolchain@v1
21+
- uses: actions/checkout@v4
22+
- uses: dtolnay/rust-toolchain@master
2323
with:
24-
profile: minimal
2524
toolchain: ${{ matrix.rust }}
26-
override: true
2725

2826
- name: Check code (cortex-m fs)
2927
run: cargo check --features "cortex-m fs"

.github/workflows/rustfmt.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
on:
2+
push:
3+
branches: [ staging, trying, master ]
4+
pull_request:
5+
6+
name: Code formatting check
7+
8+
jobs:
9+
fmt:
10+
name: Rustfmt
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: dtolnay/rust-toolchain@stable
15+
with:
16+
components: rustfmt
17+
- run: cargo fmt --all -- --check

0 commit comments

Comments
 (0)