Skip to content

Commit cc7c43d

Browse files
authored
Check for conflicting command-line option names in CI (#746)
* Run `completions` subcommand in CI to check for conflicting option names * Fix conflicting short option name for `checksum-md5` subcommand
1 parent a105cb0 commit cc7c43d

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626

2727
check:
2828
name: Check (${{ matrix.platform.target }})
29+
runs-on: ${{ matrix.platform.os }}
30+
2931
strategy:
3032
fail-fast: false
3133
matrix:
@@ -39,16 +41,15 @@ jobs:
3941
- os: "ubuntu-22.04"
4042
target: "x86_64-unknown-linux-musl"
4143
arch: "x86_64"
42-
- os: "windows-2022"
43-
target: "x86_64-pc-windows-msvc"
44-
arch: "x86_64"
4544
- os: "ubuntu-22.04"
4645
target: "aarch64-unknown-linux-gnu"
4746
arch: "arm64"
4847
- os: "ubuntu-22.04"
4948
target: "armv7-unknown-linux-gnueabihf"
5049
arch: "armhf"
51-
runs-on: ${{ matrix.platform.os }}
50+
- os: "windows-2022"
51+
target: "x86_64-pc-windows-msvc"
52+
arch: "x86_64"
5253

5354
steps:
5455
- uses: actions/checkout@v4
@@ -60,8 +61,13 @@ jobs:
6061

6162
- run: cargo check
6263

64+
- run: cargo run --package=cargo-espflash -- espflash completions bash
65+
- run: cargo run --package=espflash -- completions bash
66+
6367
check-lib:
6468
name: Check lib (${{ matrix.platform.target }})
69+
runs-on: ubuntu-22.04
70+
6571
strategy:
6672
fail-fast: false
6773
matrix:
@@ -72,7 +78,6 @@ jobs:
7278
arch: "arm64"
7379
- target: "armv7-unknown-linux-gnueabihf"
7480
arch: "armhf"
75-
runs-on: ubuntu-22.04
7681

7782
steps:
7883
- uses: actions/checkout@v4
@@ -87,6 +92,8 @@ jobs:
8792

8893
msrv:
8994
name: Check lib MSRV (${{ matrix.platform.target }})
95+
runs-on: ubuntu-22.04
96+
9097
strategy:
9198
fail-fast: false
9299
matrix:
@@ -97,7 +104,6 @@ jobs:
97104
arch: "arm64"
98105
- target: "armv7-unknown-linux-gnueabihf"
99106
arch: "armhf"
100-
runs-on: ubuntu-22.04
101107

102108
steps:
103109
- uses: actions/checkout@v4

espflash/src/cli/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ pub struct MonitorArgs {
280280
#[non_exhaustive]
281281
pub struct ChecksumMd5Args {
282282
/// Start address
283-
#[clap(short, long, value_parser=parse_u32)]
283+
#[clap(long, value_parser=parse_u32)]
284284
address: u32,
285285
/// Length
286286
#[clap(short, long, value_parser=parse_u32)]

0 commit comments

Comments
 (0)