Skip to content

Commit 84c1d57

Browse files
committed
cargo-make: Update README and CI
Signed-off-by: Daniel Schaefer <[email protected]>
1 parent 92c6cdc commit 84c1d57

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

.github/workflows/firmware.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ jobs:
1717
- name: Setup Rust toolchain
1818
run: rustup show
1919

20+
- run: cargo install cargo-make
21+
2022
- run: cargo install flip-link
21-
- run: cargo build -p ledmatrix
22-
- run: cargo build -p b1display
23-
- run: cargo build -p c1minimal
24-
- run: cargo build -p ledmatrix --release
25-
- run: cargo build -p b1display --release
26-
- run: cargo build -p c1minimal --release
23+
- run: cargo make --cwd b1display
24+
- run: cargo make --cwd c1minimal
25+
- run: cargo make --cwd ledmatrix build-release
26+
- run: cargo make --cwd b1display build-release
27+
- run: cargo make --cwd c1minimal build-release
2728

2829
- name: Convert to UF2 format
2930
run: |

.github/workflows/software.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ jobs:
4343
- name: Setup Rust toolchain
4444
run: rustup show
4545

46+
- run: cargo install cargo-make
47+
4648
- name: Build Linux tool
47-
run: cargo build --release --target x86_64-unknown-linux-gnu -p inputmodule-control
49+
run: cargo make --cwd inputmodule-control build-release
4850

4951
- name: Check if Linux tool can start
5052
run: cargo run --release --target x86_64-unknown-linux-gnu -p inputmodule-control -- --help
@@ -64,8 +66,10 @@ jobs:
6466
- name: Setup Rust toolchain
6567
run: rustup show
6668

69+
- run: cargo install cargo-make
70+
6771
- name: Build Windows tool
68-
run: cargo build --release --target x86_64-pc-windows-msvc -p inputmodule-control
72+
run: cargo make --profile windows --cwd inputmodule-control build-release
6973

7074
- name: Check if Windows tool can start
7175
run: cargo run --release --target x86_64-pc-windows-msvc -p inputmodule-control -- --help

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ cargo install elf2uf2-rs --locked
129129
Build:
130130

131131
```sh
132-
cargo build -p ledmatrix
133-
cargo build -p b1display
134-
cargo build -p c1minimal
132+
cargo make --cwd ledmatrix
133+
cargo make --cwd b1display
134+
cargo make --cwd c1minimal
135135
```
136136

137137
Generate the UF2 update file:
@@ -150,7 +150,7 @@ Currently have to specify the build target because it's not possible to specify
150150
Tracking issue: https://github.com/rust-lang/cargo/issues/9406
151151

152152
```
153-
> cargo build --target x86_64-unknown-linux-gnu -p inputmodule-control
153+
> cargo make --cwd inputmodule-control
154154
> cargo run --target x86_64-unknown-linux-gnu -p inputmodule-control
155155
```
156156

0 commit comments

Comments
 (0)