From 385f111f86d48af79d3dfc37a3d178e4ff0338aa Mon Sep 17 00:00:00 2001
From: Jesse Braham <jesse@beta7.io>
Date: Thu, 6 Feb 2025 12:59:28 +0100
Subject: [PATCH 1/2] Run `completions` subcommand in CI to check for
 conflicting option names

---
 .github/workflows/ci.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da119aef..af0c12ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,8 @@ jobs:
 
   check:
     name: Check (${{ matrix.platform.target }})
+    runs-on: ${{ matrix.platform.os }}
+
     strategy:
       fail-fast: false
       matrix:
@@ -39,16 +41,15 @@ jobs:
           - os: "ubuntu-22.04"
             target: "x86_64-unknown-linux-musl"
             arch: "x86_64"
-          - os: "windows-2022"
-            target: "x86_64-pc-windows-msvc"
-            arch: "x86_64"
           - os: "ubuntu-22.04"
             target: "aarch64-unknown-linux-gnu"
             arch: "arm64"
           - os: "ubuntu-22.04"
             target: "armv7-unknown-linux-gnueabihf"
             arch: "armhf"
-    runs-on: ${{ matrix.platform.os }}
+          - os: "windows-2022"
+            target: "x86_64-pc-windows-msvc"
+            arch: "x86_64"
 
     steps:
       - uses: actions/checkout@v4
@@ -60,8 +61,13 @@ jobs:
 
       - run: cargo check
 
+      - run: cargo run --package=cargo-espflash -- espflash completions bash
+      - run: cargo run --package=espflash -- completions bash
+
   check-lib:
     name: Check lib (${{ matrix.platform.target }})
+    runs-on: ubuntu-22.04
+
     strategy:
       fail-fast: false
       matrix:
@@ -72,7 +78,6 @@ jobs:
             arch: "arm64"
           - target: "armv7-unknown-linux-gnueabihf"
             arch: "armhf"
-    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -87,6 +92,8 @@ jobs:
 
   msrv:
     name: Check lib MSRV  (${{ matrix.platform.target }})
+    runs-on: ubuntu-22.04
+
     strategy:
       fail-fast: false
       matrix:
@@ -97,7 +104,6 @@ jobs:
             arch: "arm64"
           - target: "armv7-unknown-linux-gnueabihf"
             arch: "armhf"
-    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

From a3a0b358780d052d7b0a5209cc2d1a0ad1bb949e Mon Sep 17 00:00:00 2001
From: Jesse Braham <jesse@beta7.io>
Date: Thu, 6 Feb 2025 13:21:00 +0100
Subject: [PATCH 2/2] Fix conflicting short option name for `checksum-md5`
 subcommand

---
 espflash/src/cli/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/espflash/src/cli/mod.rs b/espflash/src/cli/mod.rs
index d1832521..661b87d2 100644
--- a/espflash/src/cli/mod.rs
+++ b/espflash/src/cli/mod.rs
@@ -280,7 +280,7 @@ pub struct MonitorArgs {
 #[non_exhaustive]
 pub struct ChecksumMd5Args {
     /// Start address
-    #[clap(short, long, value_parser=parse_u32)]
+    #[clap(long, value_parser=parse_u32)]
     address: u32,
     /// Length
     #[clap(short, long, value_parser=parse_u32)]