Skip to content

Commit

Permalink
Add further archs for testing (cisco#24)
Browse files Browse the repository at this point in the history
Add testing for non-threaded x86_64, and i386 versions and remove references to travis_fold directives in testing.

Original commit: racket/ChezScheme@75c9b6e
  • Loading branch information
Paulo Matos authored May 18, 2020
1 parent 3c889ae commit 6431c25
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 32 deletions.
6 changes: 2 additions & 4 deletions .github/scripts/build.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
#!/bin/bash
set -e -o pipefail
echo 'travis_fold:start:build'
echo Building Chez Scheme...
./configure -m=$TARGET_MACHINE
./configure -m=$MACH
make
case $TARGET_MACHINE in
case $MACH in
*a6nt)
curl -Ls https://github.com/burgerrg/win-iconv/releases/download/v0.0.9/iconv-x64.dll > $TARGET_MACHINE/bin/$TARGET_MACHINE/iconv.dll
;;
*i3nt)
curl -Ls https://github.com/burgerrg/win-iconv/releases/download/v0.0.9/iconv-x86.dll > $TARGET_MACHINE/bin/$TARGET_MACHINE/iconv.dll
;;
esac
echo 'travis_fold:end:build'
19 changes: 0 additions & 19 deletions .github/scripts/dobootfile.sh

This file was deleted.

10 changes: 4 additions & 6 deletions .github/scripts/test.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#!/bin/bash
runmats() {
echo travis_fold:start:mats
echo make allxhelp "$@"
make -C ${TARGET_MACHINE}/mats allxhelp "$@" 2>&1 | tee -a Make.out | grep '^matting '
echo travis_fold:end:mats
make -C ${MACH}/mats allxhelp "$@" 2>&1 | tee -a Make.out | grep '^matting '
}

# Split these out so that we get output every 10 minutes on Windows builds.
Expand All @@ -12,9 +10,9 @@ runmats o=3
runmats o=3 cp0=t
runmats o=3 cp0=t eval=interpret

if [ -f ${TARGET_MACHINE}/mats/summary ]; then
cat ${TARGET_MACHINE}/mats/summary
diff -q .github/scripts/summary ${TARGET_MACHINE}/mats/summary
if [ -f ${MACH}/mats/summary ]; then
cat ${MACH}/mats/summary
diff -q .github/scripts/summary ${MACH}/mats/summary
exit $?
else
exit 1
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,18 @@ jobs:
strategy:
fail-fast: false
matrix:
mach: ['ta6le']
mach: ['i3le', 'ti3le', 'a6le', 'ta6le']

env:
TARGET_MACHINE: ${{ matrix.mach }}
MACH: ${{ matrix.mach }}

steps:
- uses: Bogdanp/[email protected]
with:
distribution: 'minimal' # minimal is enough
variant: 'CS' # lets dog-food CS
version: 'current'
packages: 'cs-bootstrap'
- uses: actions/checkout@v2
with:
submodules: 'recursive'
Expand All @@ -33,7 +39,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y libncurses5-dev uuid-dev libssl-dev
- name: Build bootfiles
run: .github/scripts/dobootfile.sh
run: racket -l cs-bootstrap
- name: Build Chez
run: .github/scripts/build.sh
- name: Test Chez
Expand Down

0 comments on commit 6431c25

Please sign in to comment.