Skip to content

Commit

Permalink
restore simpler Windows CI
Browse files Browse the repository at this point in the history
Mostly reverts 01b5bb6, but also changes "/c" to "//c" --- which
seems to be the right repair to the original problem based on the way
Windows `bash` variants treat arguments that start with `/`.
  • Loading branch information
mflatt committed Oct 20, 2023
1 parent 3e936f2 commit 4ac9dac
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
cmd.exe //c "build.bat $TARGET_MACHINE"
else
if test -n "$CONFIGURE_ARGS" ; then
./configure $CONFIGURE_ARGS
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
cmd.exe //c "build.bat $TARGET_MACHINE /$TEST_TARGET"
else
make $TEST_TARGET
fi

0 comments on commit 4ac9dac

Please sign in to comment.