Skip to content

Commit ddd1119

Browse files
robamurobamu
committed
Merge newest upstream
1 parent fe6e9e4 commit ddd1119

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1283
-1112
lines changed

‎.cargo/config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[target.thumbv7em-none-eabihf]
1111
# runner = "arm-none-eabi-gdb"
1212
# Chip can be set via `--chip STM32F303VCTx` or `export PROBE_RUN_CHIP=STM32F303VCTx`
13-
runner = "probe-run --chip STM32F303VCTx --connect-under-reset"
13+
runner = "probe-rs run --chip STM32F303VCTx --connect-under-reset"
1414
rustflags = [
1515
"-C", "link-arg=--nmagic",
1616
"-C", "link-arg=-Tlink.x",

‎.clippy.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.54"
1+
msrv = "1.59"

‎.github/workflows/cargo.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: rust format
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
merge_group:
8+
9+
check-doc:
10+
name: Check Documentation Build
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: dtolnay/rust-toolchain@stable
15+
with:
16+
toolchain: nightly
17+
target: thumbv7em-none-eabihf
18+
- run: cargo doc --features=stm32f303xc
19+
20+
cargo-deny:
21+
name: Cargo Deny
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v4
25+
- uses: EmbarkStudios/cargo-deny-action@v1

‎.github/workflows/changelog.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
on:
2+
pull_request_target:
3+
types: [labeled, unlabeled, opened, synchronize, reopened]
4+
5+
name: Changelog check
6+
7+
jobs:
8+
changelog:
9+
name: Changelog check
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout sources
13+
uses: actions/checkout@v4
14+
15+
- name: Changelog updated
16+
uses: Zomzog/[email protected]
17+
with:
18+
fileName: CHANGELOG.md
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches: [master]
66
pull_request:
7+
merge_group:
78

89
jobs:
910
check:
@@ -38,177 +39,31 @@ jobs:
3839
# - stm32f334x6
3940
# - stm32f334x8
4041
steps:
41-
- uses: actions/checkout@v2
42-
- uses: actions-rs/toolchain@v1
42+
- uses: actions/checkout@v4
43+
- uses: dtolnay/rust-toolchain@stable
4344
with:
4445
toolchain: stable
4546
target: thumbv7em-none-eabihf
46-
override: true
47-
profile: minimal
4847
- run: cargo build --features=${{ matrix.mcu }} --lib --examples
4948

50-
# This is our MSRV. However this is only for documentation
51-
# purposes and should be increased if newer features are used.
52-
# This should not stop anyone from bumping the MSRV.
53-
check-msrv:
54-
name: Check MSRV
55-
runs-on: ubuntu-latest
56-
steps:
57-
- uses: actions/checkout@v2
58-
- uses: actions-rs/toolchain@v1
59-
with:
60-
toolchain: 1.54.0
61-
target: thumbv7em-none-eabihf
62-
override: true
63-
profile: minimal
64-
- uses: actions-rs/cargo@v1
65-
with:
66-
command: check
67-
args: --features=stm32f303xc,stm32-usbd,rt,can,ld --lib
68-
69-
check-min-deps:
70-
name: Check Minimal Dependency Versions
71-
runs-on: ubuntu-latest
72-
steps:
73-
- uses: actions/checkout@v2
74-
- uses: actions-rs/toolchain@v1
75-
with:
76-
toolchain: stable
77-
target: thumbv7em-none-eabihf
78-
override: true
79-
profile: minimal
80-
- uses: actions-rs/toolchain@v1
81-
with:
82-
toolchain: nightly
83-
target: thumbv7em-none-eabihf
84-
profile: minimal
85-
- run: cargo +nightly update -Z minimal-versions
86-
- uses: actions-rs/cargo@v1
87-
with:
88-
command: check
89-
args: --features=stm32f303xc,stm32-usbd,rt,can,ld --lib --examples
90-
9149
check-minimal-feature-set:
9250
name: Check minimal feature set
9351
runs-on: ubuntu-latest
9452
steps:
95-
- uses: actions/checkout@v2
96-
- uses: actions-rs/toolchain@v1
53+
- uses: actions/checkout@v4
54+
- uses: dtolnay/rust-toolchain@stable
9755
with:
9856
toolchain: stable
9957
target: thumbv7em-none-eabihf
100-
override: true
101-
profile: minimal
102-
- uses: actions-rs/cargo@v1
103-
with:
104-
command: check
105-
args: --no-default-features --features=stm32f303xc --lib --examples
58+
- run: cargo check --no-default-features --features=stm32f303xc --lib --examples
10659

10760
build-testsuite:
10861
name: Build Testsuite
10962
runs-on: ubuntu-latest
11063
steps:
111-
- uses: actions/checkout@v2
112-
- uses: actions-rs/toolchain@v1
64+
- uses: actions/checkout@v4
65+
- uses: dtolnay/rust-toolchain@stable
11366
with:
11467
toolchain: stable
11568
target: thumbv7em-none-eabihf
116-
override: true
117-
profile: minimal
118-
- uses: actions-rs/cargo@v1
119-
with:
120-
command: test
121-
args: -p testsuite --no-run
122-
123-
check-doc:
124-
name: Check Documentation Build
125-
runs-on: ubuntu-latest
126-
steps:
127-
- uses: actions/checkout@v2
128-
- uses: actions-rs/toolchain@v1
129-
with:
130-
toolchain: nightly
131-
target: thumbv7em-none-eabihf
132-
override: true
133-
profile: minimal
134-
- uses: actions-rs/cargo@v1
135-
with:
136-
command: doc
137-
args: --features=stm32f303xc
138-
139-
clippy:
140-
name: Clippy
141-
runs-on: ubuntu-latest
142-
steps:
143-
- uses: actions/checkout@v2
144-
- uses: actions-rs/toolchain@v1
145-
with:
146-
toolchain: stable
147-
target: thumbv7em-none-eabihf
148-
override: true
149-
profile: minimal
150-
components: clippy
151-
- uses: actions-rs/clippy-check@v1
152-
with:
153-
token: ${{ secrets.GITHUB_TOKEN }}
154-
args: >
155-
--features=stm32f303xc --lib --examples
156-
-- -D warnings
157-
158-
rustfmt:
159-
name: Rustfmt
160-
runs-on: ubuntu-latest
161-
steps:
162-
- uses: actions/checkout@v2
163-
- uses: actions-rs/toolchain@v1
164-
with:
165-
toolchain: stable
166-
override: true
167-
profile: minimal
168-
components: rustfmt
169-
- uses: actions-rs/cargo@v1
170-
with:
171-
command: fmt
172-
args: --all -- --check
173-
174-
codegen:
175-
name: Check Codegen
176-
runs-on: ubuntu-latest
177-
steps:
178-
- uses: actions/checkout@v2
179-
- uses: actions-rs/toolchain@v1
180-
with:
181-
toolchain: stable
182-
override: true
183-
profile: minimal
184-
components: rustfmt
185-
- run: cargo check --target "x86_64-unknown-linux-gnu" -p codegen
186-
187-
markdown-lint:
188-
name: Markdown Lint
189-
runs-on: ubuntu-latest
190-
steps:
191-
- uses: actions/checkout@v2
192-
- uses: nosborn/[email protected]
193-
with:
194-
files: .
195-
config_file: .markdownlint.yml
196-
ignore_files: target/
197-
198-
link-checker:
199-
name: Link Checker
200-
runs-on: ubuntu-latest
201-
steps:
202-
- name: Checkout
203-
uses: actions/checkout@v2
204-
- name: Check URLs in documentation
205-
uses: lycheeverse/[email protected]
206-
with:
207-
args: --verbose --no-progress "**/*.md" "**/*.rs" "Cargo.toml" "**/Cargo.toml" -h accept=text/html
208-
209-
cargo-deny:
210-
name: Cargo Deny
211-
runs-on: ubuntu-latest
212-
steps:
213-
- uses: actions/checkout@v2
214-
- uses: EmbarkStudios/cargo-deny-action@v1
69+
- run: cargo test -p testsuite --no-run

‎.github/workflows/clippy.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: clippy
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
merge_group:
8+
9+
jobs:
10+
clippy:
11+
name: Clippy
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: dtolnay/rust-toolchain@stable
16+
with:
17+
toolchain: stable
18+
target: thumbv7em-none-eabihf
19+
components: clippy
20+
- run: cargo clippy --features=stm32f303xc --lib --examples -- -D warnings
21+

‎.github/workflows/codegen.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: codegen
2+
on:
3+
push:
4+
branches: [master]
5+
pull_request:
6+
merge_group:
7+
8+
jobs:
9+
codegen:
10+
name: Check Codegen
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: dtolnay/rust-toolchain@stable
15+
with:
16+
toolchain: stable
17+
component: clippy
18+
target: x86_64-unknown-linux-gnu
19+
- run: cargo clippy -p codegen --target x86_64-unknown-linux-gnu
20+

‎.github/workflows/markdown.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: markdown
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
merge_group:
8+
9+
jobs:
10+
markdown-lint:
11+
name: Markdown Lint
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: nosborn/[email protected]
16+
with:
17+
files: .
18+
config_file: .markdownlint.yml
19+
ignore_files: target/
20+
21+
link-checker:
22+
name: Link Checker
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v4
27+
- name: Check URLs in documentation
28+
uses: lycheeverse/[email protected]
29+
with:
30+
args: --verbose --no-progress "**/*.md" "**/*.rs" "Cargo.toml" "**/Cargo.toml" -h accept=text/html
31+

‎.github/workflows/msrv.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: MSRV
2+
3+
on:
4+
pull_request:
5+
merge_group:
6+
7+
jobs:
8+
# This is our MSRV. However this is only for documentation
9+
# purposes and should be increased if newer features are used.
10+
# This should not stop anyone from bumping the MSRV.
11+
check-msrv:
12+
name: Check MSRV
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: dtolnay/rust-toolchain@stable
17+
with:
18+
toolchain: 1.60.0
19+
target: thumbv7em-none-eabihf
20+
- run: cargo check --features=stm32f303xc,usb,rt,can,ld --lib
21+
22+
check-min-deps:
23+
name: Check Minimal Dependency Versions
24+
runs-on: ubuntu-latest
25+
steps:
26+
- uses: actions/checkout@v4
27+
- uses: dtolnay/rust-toolchain@stable
28+
with:
29+
toolchain: nightly
30+
target: thumbv7em-none-eabihf
31+
- run: cargo +nightly update -Z minimal-versions
32+
- run: cargo tree
33+
- run: cargo check --features=stm32f303xc,usb,rt,can,ld --lib --examples
34+

‎.github/workflows/rustfmt.yml‎

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

0 commit comments

Comments
 (0)