From faf9bf21e1a4cfabb383af761de403822d836a70 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 20 Oct 2023 17:16:46 -0600
Subject: [PATCH] restore simpler Windows CI

Mostly reverts 01b5bb60cc, but also adds `MSYS_NO_PATHCONV=1` to solve
the original problem, which is that Windows `bash` may treat arguments
that start with `/` specially unless `MSYS_NO_PATHCONV` is set.
---
 .github/workflows/build.sh |  3 +--
 .github/workflows/ci.yml   | 10 ----------
 .github/workflows/test.sh  |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh
index 20745dddb..64c1268d4 100755
--- a/.github/workflows/build.sh
+++ b/.github/workflows/build.sh
@@ -2,8 +2,7 @@
 set -e -o pipefail
 export ZUO_JOBS="$(getconf _NPROCESSORS_ONLN)"
 if test "$TOOLCHAIN" = vs ; then
-    # cmd.exe /c "build.bat $TARGET_MACHINE"
-    echo assuming built previously
+    MSYS_NO_PATHCONV=1 cmd.exe /c "build.bat $TARGET_MACHINE"
 else
     if test -n "$CONFIGURE_ARGS" ; then
         ./configure $CONFIGURE_ARGS
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b415f1b0..5f1eb914c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,21 +75,11 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install chezscheme
-      - name: Build Chez Scheme with Visual Studio
-        if: ${{ matrix.config.toolchain == 'vs' }}
-        shell: cmd
-        run: build.bat ${{ matrix.config.machine }}
       - name: Build Chez Scheme
         run: .github/workflows/build.sh
       - name: Run tests
-        if: ${{ matrix.config.toolchain != 'vs' }}
         timeout-minutes: 60
         run: .github/workflows/test.sh
-      - name: Run tests with Visual Studio
-        if: ${{ matrix.config.toolchain == 'vs' }}
-        timeout-minutes: 60
-        shell: cmd
-        run: build.bat ${{ matrix.config.machine }} /test-some
       - name: Archive workspace
         if: always()
         run: tar -c -h -z -f $TARGET_MACHINE$TOOLCHAIN$VARIANT.tgz $TARGET_MACHINE
diff --git a/.github/workflows/test.sh b/.github/workflows/test.sh
index 042fc46a9..12c696338 100755
--- a/.github/workflows/test.sh
+++ b/.github/workflows/test.sh
@@ -4,7 +4,7 @@ if test "$TEST_TARGET" = ""; then
     TEST_TARGET=test-some
 fi
 if test "$TOOLCHAIN" = vs ; then
-    cmd.exe /c "build.bat $TARGET_MACHINE /$TEST_TARGET"
+    MSYS_NO_PATHCONV=1 cmd.exe /c "build.bat $TARGET_MACHINE /$TEST_TARGET"
 else
     make $TEST_TARGET
 fi