From 7dc35a22f18aeb14df82168052788abf32460758 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Sat, 3 Feb 2024 13:16:56 +0000 Subject: [PATCH] Fix Squeak Signed-off-by: Stefan Marr --- .github/workflows/ci.yml | 21 +++++++++------------ implementations/build-squeak32.sh | 29 ----------------------------- test.conf | 17 +++++------------ 3 files changed, 14 insertions(+), 53 deletions(-) delete mode 100755 implementations/build-squeak32.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 795d992f..fb53663c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: #- { name: Pharo, id: pharo, folder: Smalltalk } - - { name: Squeak 64-bit, id: squeak64, folder: Smalltalk } + - { name: Squeak, id: squeak, folder: Smalltalk } - { name: Ruby, id: ruby, folder: Ruby } - { name: Lua, id: lua, folder: Lua } - { name: Python, id: python, folder: Python } @@ -38,8 +38,8 @@ jobs: - name: Install asdf and asdf-awfy run: | git clone --depth 1 https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.14.0 - asdf plugin add awfy https://github.com/smarr/asdf-awfy.git - if: matrix.id == 'squeak64' + ~/.asdf/bin/asdf plugin add awfy https://github.com/smarr/asdf-awfy.git + if: matrix.id == 'squeak' - name: Install Crystal if: matrix.id == 'crystal' @@ -56,16 +56,13 @@ jobs: with: smalltalk-image: Pharo64-stable - - name: Install Squeak64 - if: matrix.id == 'squeak64' + - name: Install Squeak + if: matrix.id == 'squeak' run: | ~/.asdf/bin/asdf install awfy squeak-6.0-22148 - - - name: Install Squeak32 - if: matrix.id == 'squeak32' - uses: hpi-swa/setup-smalltalkCI@v1 - with: - smalltalk-image: Squeak32-5.2 + cp ~/.asdf/installs/awfy/squeak-6.0-22148/SqueakV60.sources benchmarks/Smalltalk/ + cp ~/.asdf/installs/awfy/squeak-6.0-22148/Squeak*.image benchmarks/Smalltalk/Squeak.image + cp ~/.asdf/installs/awfy/squeak-6.0-22148/Squeak*.changes benchmarks/Smalltalk/Squeak.changes - name: Install Ruby if: matrix.id == 'ruby' @@ -127,7 +124,7 @@ jobs: - name: Build run: | - benchmarks/${{ matrix.folder }}/build.sh + benchmarks/${{ matrix.folder }}/build.sh ${{ matrix.id }} - name: ReBench Test Run run: | diff --git a/implementations/build-squeak32.sh b/implementations/build-squeak32.sh deleted file mode 100755 index abeb0efd..00000000 --- a/implementations/build-squeak32.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -if [ "$1" = "style" ] -then - exit 0 -fi - -set -e # make script fail on first error -SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -source $SCRIPT_PATH/script.inc - -if [ ! -e "$SCRIPT_PATH/sqcogspurlinuxht" ]; then - INFO Get Squeak VM - pushd $SCRIPT_PATH - get_web_getter - $GET http://files.squeak.org/5.2/Squeak5.2-18229-32bit/Squeak5.2-18229-32bit-All-in-One.zip - $GET https://github.com/OpenSmalltalk/opensmalltalk-vm/releases/download/201810190412/squeak.cog.spur_linux32x86_201810190412.tar.gz - unzip -q Squeak5.2-18229-32bit-All-in-One.zip - mv Squeak5.2*.app/Contents/Resources/Squeak5.2*.image ../benchmarks/Smalltalk/Squeak.image - mv Squeak5.2*.app/Contents/Resources/Squeak5.2*.changes ../benchmarks/Smalltalk/Squeak.changes - mv Squeak5.2*.app/Contents/Resources/Squeak*.sources ../benchmarks/Smalltalk/ - tar xf squeak.cog.spur_linux32x86_201810190412.tar.gz - popd -fi - -INFO Build 32bit Benchmarking Image -cd $SCRIPT_PATH/../benchmarks/Smalltalk -$SCRIPT_PATH/squeak32 Squeak.image build-image-squeak.st -mv AWFY.image AWFY_Squeak32.image -mv AWFY.changes AWFY_Squeak32.changes diff --git a/test.conf b/test.conf index 1b622d6d..21deaae2 100644 --- a/test.conf +++ b/test.conf @@ -80,15 +80,10 @@ benchmark_suites: location: benchmarks/Smalltalk command: "AWFY_Pharo.image run.st %(benchmark)s 1 " benchmarks: *BENCHMARKS - test-squeak32: + test-squeak: gauge_adapter: RebenchLog location: benchmarks/Smalltalk - command: "AWFY_Squeak32.image $(pwd)/run.st %(benchmark)s 1 " - benchmarks: *BENCHMARKS - test-squeak64: - gauge_adapter: RebenchLog - location: benchmarks/Smalltalk - command: "AWFY_Squeak64.image $(pwd)/run.st %(benchmark)s 1 " + command: "AWFY_Squeak.image $(pwd)/run.st %(benchmark)s 1 " benchmarks: *BENCHMARKS test-lua: @@ -130,12 +125,10 @@ executors: Pharo: path: implementations/ executable: pharo - Squeak32: - path: implementations/ - executable: squeak32 Squeak64: - path: implementations/ - executable: squeak64 + path: /home/runner/.asdf/install/awfy/squeak-6.0-22148/bin/ + executable: squeak + args: -headless -nodisplay -nosound Lua52: path: .lua/bin executable: lua5.2