Fix Squeak

Signed-off-by: Stefan Marr <[email protected]>

.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: |

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