Skip to content

Commit c3e134f

Browse files
committed
cargo-make: Allow running tool
Signed-off-by: Daniel Schaefer <[email protected]>
1 parent 4789931 commit c3e134f

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.github/workflows/software.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: cargo make --cwd inputmodule-control build-release
5050

5151
- name: Check if Linux tool can start
52-
run: cargo run --release --target x86_64-unknown-linux-gnu -p inputmodule-control -- --help
52+
run: cargo make --cwd inputmodule-control run -- --help | grep 'RAW Hid and VIA commandline'
5353

5454
- name: Upload Linux tool
5555
uses: actions/upload-artifact@v3
@@ -72,7 +72,7 @@ jobs:
7272
run: cargo make --cwd inputmodule-control build-release
7373

7474
- name: Check if Windows tool can start
75-
run: cargo run --release --target x86_64-pc-windows-msvc -p inputmodule-control -- --help
75+
run: cargo make --cwd inputmodule-control run -- --help | grep 'RAW Hid and VIA commandline'
7676

7777
- name: Upload Windows App
7878
uses: actions/upload-artifact@v3

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,11 @@ Currently have to specify the build target because it's not possible to specify
157157
Tracking issue: https://github.com/rust-lang/cargo/issues/9406
158158

159159
```
160+
# Build it
160161
> cargo make --cwd inputmodule-control
161-
> cargo run --target x86_64-unknown-linux-gnu -p inputmodule-control
162+
163+
# Build and run it, showing the tool version
164+
> cargo make --cwd inputmodule-control run -- --version
162165
```
163166

164167
### Check the firmware version of the device

inputmodule-control/Makefile.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,11 @@ extend = "../Makefile.toml"
44
[env]
55
TARGET_TRIPLE = "${CARGO_MAKE_RUST_TARGET_TRIPLE}"
66

7+
[tasks.run]
8+
command = "cargo"
9+
args = [
10+
"run",
11+
"--target",
12+
"${CARGO_MAKE_RUST_TARGET_TRIPLE}",
13+
"${@}",
14+
]

0 commit comments

Comments
 (0)