From cce0706b1f2a9e2d1f02c57f2d1cd367c91df1ae Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@wezfurlong.org>
Date: Fri, 5 Apr 2024 18:09:10 -0700
Subject: [PATCH] ci: another attempt at fixing up windows path

---
 .github/workflows/gen_windows.yml            | 2 +-
 .github/workflows/gen_windows_continuous.yml | 2 +-
 .github/workflows/gen_windows_tag.yml        | 2 +-
 ci/generate-workflows.py                     | 7 +++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gen_windows.yml b/.github/workflows/gen_windows.yml
index 37951564d..22f36ec98 100644
--- a/.github/workflows/gen_windows.yml
+++ b/.github/workflows/gen_windows.yml
@@ -73,7 +73,7 @@ jobs:
           crate: "cargo-nextest"
           cache-key: "windows"
       - name: "Test"
-        shell: bash
+        shell: cmd
         run: |
           PATH C:\Strawberry\perl\bin;%PATH%
           cargo nextest run --all --no-fail-fast
diff --git a/.github/workflows/gen_windows_continuous.yml b/.github/workflows/gen_windows_continuous.yml
index b020a25ca..0d9701ddc 100644
--- a/.github/workflows/gen_windows_continuous.yml
+++ b/.github/workflows/gen_windows_continuous.yml
@@ -76,7 +76,7 @@ jobs:
           crate: "cargo-nextest"
           cache-key: "windows"
       - name: "Test"
-        shell: bash
+        shell: cmd
         run: |
           PATH C:\Strawberry\perl\bin;%PATH%
           cargo nextest run --all --no-fail-fast
diff --git a/.github/workflows/gen_windows_tag.yml b/.github/workflows/gen_windows_tag.yml
index b1a30efbf..9a067256f 100644
--- a/.github/workflows/gen_windows_tag.yml
+++ b/.github/workflows/gen_windows_tag.yml
@@ -63,7 +63,7 @@ jobs:
           crate: "cargo-nextest"
           cache-key: "windows"
       - name: "Test"
-        shell: bash
+        shell: cmd
         run: |
           PATH C:\Strawberry\perl\bin;%PATH%
           cargo nextest run --all --no-fail-fast
diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py
index 274c37ae6..c241b16f0 100755
--- a/ci/generate-workflows.py
+++ b/ci/generate-workflows.py
@@ -480,10 +480,9 @@ rustup default {toolchain}
             # Install cargo-nextest
             InstallCrateStep("cargo-nextest", key=self.name),
             # Run tests
-            RunStep(
-                name="Test",
-                run=self.fixup_windows_path(run),
-            ),
+            RunStep(name="Test", run=self.fixup_windows_path(run), shell="cmd")
+            if "win" in self.name
+            else RunStep(name="Test", run=run),
         ]
 
     def package(self, trusted=False):