From 65146afcf58dd4512f7b083a817943b2a7e6af4b Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:12:35 +0200 Subject: [PATCH 01/16] Move from Travis to GitHub Actions This consolidates use of GitHub Actions, since we are using it as well with racket/racket. original commit: c3bf252c76ef594dfccf332def30f3d9c733282d --- {.travis => .github/scripts}/build.sh | 0 {.travis => .github/scripts}/dobootfile.sh | 0 {.travis => .github/scripts}/summary | 0 {.travis => .github/scripts}/test.sh | 2 +- .github/workflows/build.yml | 46 +++++++++++++++ .travis.yml | 66 ---------------------- 6 files changed, 47 insertions(+), 67 deletions(-) rename {.travis => .github/scripts}/build.sh (100%) rename {.travis => .github/scripts}/dobootfile.sh (100%) rename {.travis => .github/scripts}/summary (100%) rename {.travis => .github/scripts}/test.sh (87%) create mode 100644 .github/workflows/build.yml delete mode 100644 .travis.yml diff --git a/.travis/build.sh b/.github/scripts/build.sh similarity index 100% rename from .travis/build.sh rename to .github/scripts/build.sh diff --git a/.travis/dobootfile.sh b/.github/scripts/dobootfile.sh similarity index 100% rename from .travis/dobootfile.sh rename to .github/scripts/dobootfile.sh diff --git a/.travis/summary b/.github/scripts/summary similarity index 100% rename from .travis/summary rename to .github/scripts/summary diff --git a/.travis/test.sh b/.github/scripts/test.sh similarity index 87% rename from .travis/test.sh rename to .github/scripts/test.sh index 38ee73fb95..64161aef68 100755 --- a/.travis/test.sh +++ b/.github/scripts/test.sh @@ -14,7 +14,7 @@ runmats o=3 cp0=t eval=interpret if [ -f ${TARGET_MACHINE}/mats/summary ]; then cat ${TARGET_MACHINE}/mats/summary - diff -q .travis/summary ${TARGET_MACHINE}/mats/summary + diff -q .github/scripts/summary ${TARGET_MACHINE}/mats/summary exit $? else exit 1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..7fa50efc0a --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,46 @@ +name: Build CI + +on: [push, pull_request] + +jobs: + + build-linux: + runs-on: ubuntu-18.04 + container: ubuntu:20.04 + + strategy: + fail-fast: false + matrix: + mach: [i3le, ti3le, i6le, ta6le] + + env: + TARGET_MACHINE: ${{ matrix.mach }} + + steps: + - uses: actions/checkout@v1 + - name: Build bootfiles + run: .github/scripts/dobootfile.sh + - name: Build Chez + run: .github/scripts/build.sh + - name: Test Chez + run: .github/scripts/test.sh + + build-macos: + runs-on: macos-latest + + strategy: + fail-fast: false + matrix: + mach: [i3le, ti3le, i6le, ta6le] + + env: + TARGET_MACHINE: ${{ matrix.mach }} + + steps: + - uses: actions/checkout@v1 + - name: Build bootfiles + run: .github/scripts/dobootfile.sh + - name: Build Chez + run: .github/scripts/build.sh + - name: Test Chez + run: .github/scripts/test.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2d90521da2..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,66 +0,0 @@ -language: c -matrix: - include: - # macOS - #- env: TARGET_MACHINE=i3osx - # os: osx - #- env: TARGET_MACHINE=ti3osx - # os: osx - #- env: TARGET_MACHINE=a6osx - # os: osx - #- env: TARGET_MACHINE=ta6osx - # os: osx - - # Linux - - env: TARGET_MACHINE=i3le - os: linux - addons: - apt: - packages: - - gcc-multilib - - lib32ncurses5-dev - - libx32ncurses5-dev - - uuid-dev:i386 - - libssl-dev:i386 - - env: TARGET_MACHINE=ti3le - os: linux - addons: - apt: - packages: - - gcc-multilib - - lib32ncurses5-dev - - libx32ncurses5-dev - - uuid-dev:i386 - - libssl-dev:i386 - - env: TARGET_MACHINE=a6le - os: linux - - env: TARGET_MACHINE=ta6le - os: linux - - # Windows - #- env: TARGET_MACHINE=i3nt - # os: windows - # before_script: - # - git config core.autocrlf false; rm .git/index; git reset --hard - # - choco install make -y - #- env: TARGET_MACHINE=ti3nt - # os: windows - # before_script: - # - git config core.autocrlf false; rm .git/index; git reset --hard - # - choco install make -y - #- env: TARGET_MACHINE=a6nt - # os: windows - # before_script: - # - git config core.autocrlf false; rm .git/index; git reset --hard - # - choco install make -y - #- env: TARGET_MACHINE=ta6nt - # os: windows - # before_script: - # - git config core.autocrlf false; rm .git/index; git reset --hard - # - choco install make -y -dist: xenial -before_script: - - .travis/dobootfile.sh -script: - - .travis/build.sh - - .travis/test.sh From 99c1814b8c009d0d3589dd72c1dc3106516d7729 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:18:48 +0200 Subject: [PATCH 02/16] Install curl dependency original commit: b3a765ab2291c1879810b13e9e4b1f9a73515b40 --- .github/scripts/dobootfile.sh | 5 +---- .github/workflows/build.yml | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/scripts/dobootfile.sh b/.github/scripts/dobootfile.sh index aea46fc013..33e1c0512c 100755 --- a/.github/scripts/dobootfile.sh +++ b/.github/scripts/dobootfile.sh @@ -11,10 +11,7 @@ curl -L -o installer.sh http://www.cs.utah.edu/plt/snapshots/current/installers/ sh installer.sh --in-place --dest ~/racket/ ~/racket/bin/racket -v -~/racket/bin/raco pkg install -i --auto --no-setup cs-bootstrap -~/racket/bin/raco setup -D cs-bootstrap - -cd ChezScheme/ +~/racket/bin/raco pkg install -i --auto -D cs-bootstrap export MACH=$TARGET_MACHINE ~/racket/bin/racket -l cs-bootstrap diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7fa50efc0a..6f74c3236e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,8 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Install dependencies + run: apt-get update && apt-get install -y curl - name: Build bootfiles run: .github/scripts/dobootfile.sh - name: Build Chez From da02466c215ab679ddb0f02abf70034266223a76 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:21:48 +0200 Subject: [PATCH 03/16] Remove macos, fix home original commit: d3bd54c562099a65618be8d692828d4437e0e067 --- .github/scripts/dobootfile.sh | 8 ++++---- .github/workflows/build.yml | 20 -------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/scripts/dobootfile.sh b/.github/scripts/dobootfile.sh index 33e1c0512c..606387a395 100755 --- a/.github/scripts/dobootfile.sh +++ b/.github/scripts/dobootfile.sh @@ -8,11 +8,11 @@ case $TARGET_MACHINE in *) esac curl -L -o installer.sh http://www.cs.utah.edu/plt/snapshots/current/installers/min-racket-current-${INST}-linux-precise.sh -sh installer.sh --in-place --dest ~/racket/ +sh installer.sh --in-place --dest $HOME/racket/ -~/racket/bin/racket -v -~/racket/bin/raco pkg install -i --auto -D cs-bootstrap +$HOME/racket/bin/racket -v +$HOME/racket/bin/raco pkg install -i --auto -D cs-bootstrap export MACH=$TARGET_MACHINE -~/racket/bin/racket -l cs-bootstrap +$HOME/racket/bin/racket -l cs-bootstrap diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f74c3236e..a21b19e840 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,23 +26,3 @@ jobs: run: .github/scripts/build.sh - name: Test Chez run: .github/scripts/test.sh - - build-macos: - runs-on: macos-latest - - strategy: - fail-fast: false - matrix: - mach: [i3le, ti3le, i6le, ta6le] - - env: - TARGET_MACHINE: ${{ matrix.mach }} - - steps: - - uses: actions/checkout@v1 - - name: Build bootfiles - run: .github/scripts/dobootfile.sh - - name: Build Chez - run: .github/scripts/build.sh - - name: Test Chez - run: .github/scripts/test.sh From b3eb7c1301893b3529c773129d163fb950a6771a Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:23:52 +0200 Subject: [PATCH 04/16] Give up on container use - it's broken in Actions original commit: f1d99416e05d80e38e9da362ece926814339445c --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a21b19e840..51055f7075 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,6 @@ jobs: build-linux: runs-on: ubuntu-18.04 - container: ubuntu:20.04 strategy: fail-fast: false From 1d901527299407e0d1455977bc606160276814b4 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:32:17 +0200 Subject: [PATCH 05/16] No need curl on vm original commit: 89de1e481062272e5b6fc9d1a7049a33084c9696 --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51055f7075..a9078d7f74 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,6 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Install dependencies - run: apt-get update && apt-get install -y curl - name: Build bootfiles run: .github/scripts/dobootfile.sh - name: Build Chez From d310797c6916e04f56faaa58d2e6a004595ab171 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:35:50 +0200 Subject: [PATCH 06/16] Print target machine information original commit: 8c9ee4f00940af5ee557c2c93892209651757610 --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9078d7f74..f214c4c68c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,8 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Proceed with TARGET_MACHINE == ${{ matrix.mach }} + run: echo $TARGET_MACHINE - name: Build bootfiles run: .github/scripts/dobootfile.sh - name: Build Chez From 8f93ceebbae7bd512d0a6ec95201bfe4274649fc Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:36:30 +0200 Subject: [PATCH 07/16] Fix mach names original commit: d76bb24964a0eb65fa9205f2564b7e62d5c6c5ff --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f214c4c68c..bc28a9ecfc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - mach: [i3le, ti3le, i6le, ta6le] + mach: ['i3le', 'ti3le', 'i6le', 'ta6le'] env: TARGET_MACHINE: ${{ matrix.mach }} From bb68010646b5e5f3855f452028c88e0671e1c997 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:40:44 +0200 Subject: [PATCH 08/16] enter dir original commit: f3911a672310bb21637cdf4901cb2e3ce8d8b53e --- .github/scripts/dobootfile.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/scripts/dobootfile.sh b/.github/scripts/dobootfile.sh index 606387a395..03ceea230e 100755 --- a/.github/scripts/dobootfile.sh +++ b/.github/scripts/dobootfile.sh @@ -14,5 +14,6 @@ $HOME/racket/bin/racket -v $HOME/racket/bin/raco pkg install -i --auto -D cs-bootstrap export MACH=$TARGET_MACHINE +cd ChezScheme $HOME/racket/bin/racket -l cs-bootstrap From d3c991211b77c8b6aa58ba70b4e5c93f6634d985 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:42:55 +0200 Subject: [PATCH 09/16] fix arch name original commit: 532392ce4e8788228a30c12a38767f460538b298 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc28a9ecfc..4170b0093a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - mach: ['i3le', 'ti3le', 'i6le', 'ta6le'] + mach: ['i3le', 'ti3le', 'a6le', 'ta6le'] env: TARGET_MACHINE: ${{ matrix.mach }} From 9314bd9bdcdc32f50ecbcd0bd432064769e83d71 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:46:32 +0200 Subject: [PATCH 10/16] Install 32 bit libs original commit: 5cf419506d3fd29e7ef82b55fcfe31d75db6f597 --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4170b0093a..7c1c2ddd04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,11 @@ jobs: - uses: actions/checkout@v1 - name: Proceed with TARGET_MACHINE == ${{ matrix.mach }} run: echo $TARGET_MACHINE + - name: Install multilib for 32-bit + if: matrix.mach == 'i3le' || matrix.mach == 'ti3le' + run: | + sudo apt-get update + sudo apt-get install -y gcc-multilib lib32ncurses5-dev libx32ncurses5-dev uuid-dev:i386 libssl-dev:i386 - name: Build bootfiles run: .github/scripts/dobootfile.sh - name: Build Chez From 7313545ebffb9b61ea33d3dc74fcc66a14e1b52c Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:50:35 +0200 Subject: [PATCH 11/16] Add i386 arch original commit: db690229a30c125990cf8c89b3cb9c29afa784e6 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c1c2ddd04..6f27489142 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,7 @@ jobs: - name: Install multilib for 32-bit if: matrix.mach == 'i3le' || matrix.mach == 'ti3le' run: | + sudo dpkg --add-architecture i386 sudo apt-get update sudo apt-get install -y gcc-multilib lib32ncurses5-dev libx32ncurses5-dev uuid-dev:i386 libssl-dev:i386 - name: Build bootfiles From a523d285cd2d9fe303b0dc9819e75ea6782e68e9 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:53:24 +0200 Subject: [PATCH 12/16] download submodules original commit: dc1e5a41955a1c9d20cff84fc03ec211226bfd47 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f27489142..29f83c2af2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,7 @@ jobs: steps: - uses: actions/checkout@v1 + submodules: 'recursive' - name: Proceed with TARGET_MACHINE == ${{ matrix.mach }} run: echo $TARGET_MACHINE - name: Install multilib for 32-bit From d2fc1f42357278bb75682536224f94e55b487d82 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 13:55:09 +0200 Subject: [PATCH 13/16] Fix syntax original commit: fb2afff12c3924889a8dab383fb655f7fe726bba --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29f83c2af2..a8356df079 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,9 @@ jobs: TARGET_MACHINE: ${{ matrix.mach }} steps: - - uses: actions/checkout@v1 - submodules: 'recursive' + - uses: actions/checkout@v2 + with: + submodules: 'recursive' - name: Proceed with TARGET_MACHINE == ${{ matrix.mach }} run: echo $TARGET_MACHINE - name: Install multilib for 32-bit From 00bb57300b0f3fb99d0fdeb379f863a920d845c9 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 14:12:15 +0200 Subject: [PATCH 14/16] Install libs original commit: 716f0eec0d1d00905e92237401aaa5bf524a4a47 --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8356df079..254970244e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,12 +21,17 @@ jobs: submodules: 'recursive' - name: Proceed with TARGET_MACHINE == ${{ matrix.mach }} run: echo $TARGET_MACHINE - - name: Install multilib for 32-bit + - name: Install libs for 32-bit if: matrix.mach == 'i3le' || matrix.mach == 'ti3le' run: | sudo dpkg --add-architecture i386 sudo apt-get update sudo apt-get install -y gcc-multilib lib32ncurses5-dev libx32ncurses5-dev uuid-dev:i386 libssl-dev:i386 + - name: Install libs for 64-bit + if: matrix.mach == 'a6le' || matrix.mach == 'ta6le' + run: | + sudo apt-get update + sudo apt-get install -y libncurses5-dev libxncurses5-dev uuid-dev libssl-dev - name: Build bootfiles run: .github/scripts/dobootfile.sh - name: Build Chez From 63239e5d78e88234e8ceaca12bc7c28d86786a3f Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 14:15:49 +0200 Subject: [PATCH 15/16] Fix libs original commit: 257e00f48932fa02cf3f507adf482345edc2adc4 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 254970244e..c06d70f6a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: if: matrix.mach == 'a6le' || matrix.mach == 'ta6le' run: | sudo apt-get update - sudo apt-get install -y libncurses5-dev libxncurses5-dev uuid-dev libssl-dev + sudo apt-get install -y libncurses5-dev uuid-dev libssl-dev - name: Build bootfiles run: .github/scripts/dobootfile.sh - name: Build Chez From ea2454ec7b301d3c89b810a0d4925b33f52685f7 Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Sun, 26 Apr 2020 14:33:29 +0200 Subject: [PATCH 16/16] Remove broken archs original commit: 443c99decdffb016b6b048904f854bd183b66efc --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c06d70f6a9..20d553586f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - mach: ['i3le', 'ti3le', 'a6le', 'ta6le'] + mach: ['ta6le'] env: TARGET_MACHINE: ${{ matrix.mach }}