[AS-11967] pharo12, 13用にmasterの変更を反映

.github/workflows/main.yml

@@ -0,0 +1,108 @@
+name: smalltalkCI Self Test
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+      - '.appveyor.yml'
+      - '.travis.yml'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+      - '.appveyor.yml'
+      - '.travis.yml'
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ ubuntu-20.04, macos-latest, windows-2019 ]
+        smalltalk:
+          - Squeak64-trunk
+          - Squeak64-6.0
+          - Squeak64-5.3
+          - Squeak64-5.2
+          - Squeak64-5.1
+          - Squeak32-trunk
+          - Squeak32-6.0
+          - Squeak32-4.5
+          - Pharo64-stable
+          - Pharo64-alpha
+          - Pharo64-13
+          - Pharo64-12
+          - Pharo64-11
+          - Pharo64-10
+          - Pharo64-9.0
+          - Pharo64-8.0
+          - Pharo64-7.0
+          - Pharo64-6.1
+          - Pharo64-6.0
+          - Pharo32-stable
+          - Pharo32-alpha
+          - Pharo32-3.0
+          - Moose64-12
+          - Moose64-11
+          - Moose64-10
+          - Moose64-9.0
+          - Moose64-8.0
+          - GemStone64-3.5.8
+          - GemStone64-3.6.8
+          - GemStone64-3.7.1
+          - GToolkit64-release
+        exclude: # exclude 32bit builds on macOS and GemStone builds on windows
+          - os: macos-latest
+            smalltalk: Squeak32-trunk
+          - os: macos-latest
+            smalltalk: Squeak32-6.0
+          - os: macos-latest
+            smalltalk: Squeak32-4.5
+          - os: macos-latest
+            smalltalk: Pharo32-stable
+          - os: macos-latest
+            smalltalk: Pharo32-alpha
+          - os: macos-latest
+            smalltalk: Pharo32-3.0
+          - os: macos-latest
+            smalltalk: GemStone64-3.5.8
+          - os: macos-latest
+            smalltalk: GemStone64-3.6.8
+          - os: windows-2019
+            smalltalk: Pharo64-10
+          - os: windows-2019
+            smalltalk: Pharo64-6.0
+          - os: windows-2019
+            smalltalk: GemStone64-3.5.8
+          - os: windows-2019
+            smalltalk: GemStone64-3.6.8
+          - os: windows-2019
+            smalltalk: GemStone64-3.7.1
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup smalltalkCI
+        uses: hpi-swa/setup-smalltalkCI@v1
+        with:
+          smalltalk-image: ${{ matrix.smalltalk }}
+      - name: Run smalltalkCI self test
+        run: |
+          tests/all_tests.sh
+          bin/smalltalkci -s ${{ matrix.smalltalk }} --self-test
+        shell: bash
+        if: contains(matrix.smalltalk, 'trunk') == false && contains(matrix.smalltalk, 'alpha') == false && contains(matrix.smalltalk, 'Squeak32-6.0') == false && contains(matrix.smalltalk, 'GToolkit64') == false && contains(matrix.smalltalk, 'Pharo64-12') == false
+        timeout-minutes: 15
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Run smalltalkCI self test and ignore failures
+        run: bin/smalltalkci -s ${{ matrix.smalltalk }} --self-test || true
+        shell: bash
+        if: contains(matrix.smalltalk, 'trunk') || contains(matrix.smalltalk, 'alpha') || contains(matrix.smalltalk, 'Squeak32-6.0') || contains(matrix.smalltalk, 'GToolkit64') || contains(matrix.smalltalk, 'Pharo64-12')
+        # Builds on macOS are extremely slow for some reason, and the Squeak trunk
+        # image hits the 15 minute timeout because it needs to update from the repository
+        # each time, which takes forever.
+        timeout-minutes: ${{ (matrix.os == 'macos-latest' && contains(matrix.smalltalk, 'trunk')) && 30 || 15 }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -72,21 +72,22 @@ they can take up a lot of space on your drive.*
 
 ## <a name="images"/>List of Supported Images
 
-| [Squeak][squeak] | [Pharo][pharo]   | [GemStone][gemstone] | [Moose][moose]  | [GToolkit][gtoolkit] | 
+| [Squeak][squeak] | [Pharo][pharo]   | [GemStone][gemstone] | [Moose][moose]  | [GToolkit][gtoolkit] |
 | ---------------- | ---------------- | -------------------- | --------------- | -------------------- |
 | `Squeak64-trunk` | `Pharo64-alpha`  | `GemStone64-3.6.x`   | `Moose64-trunk` | `GToolkit64-release` |
-| `Squeak64-6.0`   | `Pharo64-stable` | `GemStone64-3.5.8`   | `Moose64-11`    |                      |
-| `Squeak64-5.3`   | `Pharo64-12`     | `GemStone64-3.5.7`   | `Moose64-10`    |                      |
-| `Squeak64-5.2`   | `Pharo64-11`     | `GemStone64-3.5.6`   | `Moose64-9.0`   |                      |
-| `Squeak64-5.1`   | `Pharo64-10`     | `GemStone64-3.5.5`   | `Moose64-8.0`   |                      |
-| `Squeak32-trunk` | `Pharo64-9.0`    | `Gemstone64-3.5.4`   | `Moose64-7.0`   |                      |
-| `Squeak32-6.0`   | `Pharo64-8.0`    | `GemStone64-3.5.3`   | `Moose32-trunk` |                      |
-| `Squeak32-5.3`   | `Pharo64-7.0`    |                      | `Moose32-6.1`   |                      |
-| `Squeak32-5.2`   | `Pharo64-6.1`    |                      | `Moose32-6.0`   |                      |
-| `Squeak32-5.1`   | `Pharo64-6.0`    |                      |                 |                      |
-| `Squeak32-5.0`   | `Pharo32-alpha`  |                      |                 |                      |
-| `Squeak32-4.6`   | `Pharo32-stable` |                      |                 |                      |
-| `Squeak32-4.5`   | `Pharo32-12`     |                      |                 |                      |
+| `Squeak64-6.0`   | `Pharo64-stable` | `GemStone64-3.5.8`   | `Moose64-12`    |                      |
+| `Squeak64-5.3`   | `Pharo64-13`     | `GemStone64-3.5.7`   | `Moose64-11`    |                      |
+| `Squeak64-5.2`   | `Pharo64-12`     | `GemStone64-3.5.6`   | `Moose64-10`    |                      |
+| `Squeak64-5.1`   | `Pharo64-11`     | `GemStone64-3.5.5`   | `Moose64-9.0`   |                      |
+| `Squeak32-trunk` | `Pharo64-10`     | `Gemstone64-3.5.4`   | `Moose64-8.0`   |                      |
+| `Squeak32-6.0`   | `Pharo64-9.0`    | `GemStone64-3.5.3`   |                 |                      |
+| `Squeak32-5.3`   | `Pharo64-8.0`    |                      |                 |                      |
+| `Squeak32-5.2`   | `Pharo64-7.0`    |                      |                 |                      |
+| `Squeak32-5.1`   | `Pharo64-6.1`    |                      |                 |                      |
+| `Squeak32-5.0`   | `Pharo64-6.0`    |                      |                 |                      |
+| `Squeak32-4.6`   | `Pharo32-alpha`  |                      |                 |                      |
+| `Squeak32-4.5`   | `Pharo32-stable` |                      |                 |                      |
+|                  | `Pharo32-12`     |                      |                 |                      |
 |                  | `Pharo32-11`     |                      |                 |                      |
 |                  | `Pharo32-10`     |                      |                 |                      |
 |                  | `Pharo32-9.0`    |                      |                 |                      |

gtoolkit/run.sh

@@ -107,9 +107,11 @@ gtoolkit::prepare_gt() {
   local gtoolkit_image_url
   local download_name
   local target
+  local smalltalk_version
   gtoolkit_image_url="$(gtoolkit::archive_url)"
+  smalltalk_version="$(basename "${gtoolkit_image_url}" .zip)"
   download_name="$(basename "${gtoolkit_image_url}")"
-  target="${SMALLTALK_CI_CACHE}/${download_name}"
+  target="${SMALLTALK_CI_CACHE}/${smalltalk_version}"
 
   if "${config_overwrite_cache}" && is_dir "${target}"; then
     print_info "Removing cached image resources for ${smalltalk_name} (update forced)"
@@ -118,15 +120,15 @@ gtoolkit::prepare_gt() {
   if ! is_dir "${target}"; then
     mkdir "${target}"
   fi
-  if ! is_file "${target}"/*.image; then
-    fold_start download_image "Downloading ${smalltalk_name} image..."
-      download_file "${gtoolkit_image_url}" "${target}"
+  if ! is_file "${target}/${download_name}"; then
+    fold_start download_image "Downloading ${smalltalk_version}..."
+      download_file "${gtoolkit_image_url}" "${target}/${download_name}"
     fold_end download_image
   fi
 
   print_info "Extracting GT..."
-  extract_file "${target}" "${SMALLTALK_CI_BUILD}"
-  echo "${download_name}" > "${SMALLTALK_CI_BUILD}"/version
+  extract_file "${target}/${download_name}" "${SMALLTALK_CI_BUILD}" > /dev/null
+  echo "${smalltalk_version}" > "${SMALLTALK_CI_BUILD}"/version
 
   print_info "Preparing GToolkit image..."
   if ! is_file "${SMALLTALK_CI_IMAGE}"; then
@@ -174,13 +176,19 @@ gtoolkit::load_project() {
         metacello := Metacello new
             baseline: 'SmalltalkCI';
             repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-            onUpgrade: [ :ex | ex useIncoming ].
+            onUpgrade: [ :ex | ex useIncoming ];
+            ignoreImage.
         (Metacello canUnderstand: #onConflictUseIncoming)
             ifTrue: [ metacello onConflictUseIncoming ]
             ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-        metacello load ]
-            on: Warning
-            do: [ :w | w resume ].
+                ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+                  on: KeyNotFound
+                  do: [ :keyEx | keyEx resumeUnchecked: nil ])
+                    ifNil: [ metacello load ]
+                    ifNotNil: [ :exceptionClass |
+                      [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                        on: Warning
+                        do: [ :w | w resume ].
     smalltalkCI := Smalltalk at: #SmalltalkCI.
     smalltalkCI load: '$(resolve_path "${config_ston}")'.
     (smalltalkCI isHeadless or: [ smalltalkCI promptToProceed ])
@@ -203,13 +211,19 @@ gtoolkit::test_project() {
                 metacello := Metacello new
                     baseline: 'SmalltalkCI';
                     repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-                    onUpgrade: [ :ex | ex useIncoming ].
+                    onUpgrade: [ :ex | ex useIncoming ];
+                    ignoreImage.
                 (Metacello canUnderstand: #onConflictUseIncoming)
                     ifTrue: [ metacello onConflictUseIncoming ]
                     ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-                metacello load ]
-                    on: Warning
-                    do: [ :w | w resume ].
+                ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+                  on: KeyNotFound
+                  do: [ :keyEx | keyEx resumeUnchecked: nil ])
+                    ifNil: [ metacello load ]
+                    ifNotNil: [ :exceptionClass |
+                      [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                        on: Warning
+                        do: [ :w | w resume ].
             Smalltalk at: #SmalltalkCI ].
     smalltalkCI test: '$(resolve_path "${config_ston}")'
   "

helpers.sh

@@ -70,7 +70,7 @@ print_help() {
     --headful               Open vm in headful mode and do not close image.
     --image                 Custom image for build (Squeak/Pharo).
     --install               Install symlink to this smalltalkCI instance.
-    --overwrite-cache   Download the newest image and cache it.
+    --overwrite-cache       Download the newest image and cache it.
     --print-env             Print all environment variables used by smalltalkCI
     --no-color              Disable colored output
     --no-tracking           Disable collection of anonymous build metrics (Travis CI & AppVeyor only).