Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

restore simpler Windows CI #738

Merged
merged 1 commit into from
Oct 24, 2023
Merged

restore simpler Windows CI #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build.sh
View file
Open in desktop
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
MSYS_NO_PATHCONV=1 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
View file
Open in desktop
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
View file
Open in desktop
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"
MSYS_NO_PATHCONV=1 cmd.exe /c "build.bat $TARGET_MACHINE /$TEST_TARGET"
else
make $TEST_TARGET
fi