diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 368c74b6..d871bc37 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,6 +31,7 @@ jobs: - Squeak32-4.5 - Pharo64-stable - Pharo64-alpha + - Pharo64-14 - Pharo64-13 - Pharo64-12 - Pharo64-11 @@ -48,10 +49,12 @@ jobs: - Moose64-10 - Moose64-9.0 - Moose64-8.0 + - GemStone64-3.5.3 - GemStone64-3.5.8 - GemStone64-3.6.8 - GemStone64-3.7.1 - GToolkit64-release + timeout-minutes: [ 15 ] exclude: # exclude 32bit builds on macOS and GemStone builds on windows - os: macos-latest smalltalk: Squeak32-trunk @@ -73,6 +76,8 @@ jobs: smalltalk: Pharo64-10 - os: windows-2019 smalltalk: Pharo64-6.0 + - os: windows-2019 + smalltalk: GemStone64-3.5.3 - os: windows-2019 smalltalk: GemStone64-3.5.8 - os: windows-2019 diff --git a/README.md b/README.md index 8ff8c9cb..8f695a9d 100644 --- a/README.md +++ b/README.md @@ -76,17 +76,18 @@ they can take up a lot of space on your drive.* | ---------------- | ---------------- | -------------------- | --------------- | -------------------- | | `Squeak64-trunk` | `Pharo64-alpha` | `GemStone64-3.6.x` | `Moose64-trunk` | `GToolkit64-release` | | `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` | | | | +| `Squeak64-5.3` | `Pharo64-14` | `GemStone64-3.5.7` | `Moose64-11` | | +| `Squeak64-5.2` | `Pharo64-13` | `GemStone64-3.5.6` | `Moose64-10` | | +| `Squeak64-5.1` | `Pharo64-12` | `GemStone64-3.5.5` | `Moose64-9.0` | | +| `Squeak32-trunk` | `Pharo64-11` | `Gemstone64-3.5.4` | `Moose64-8.0` | | +| `Squeak32-6.0` | `Pharo64-10` | `GemStone64-3.5.3` | | | +| `Squeak32-5.3` | `Pharo64-9.0` | | | | +| `Squeak32-5.2` | `Pharo64-8.0` | | | | +| `Squeak32-5.1` | `Pharo64-7.0` | | | | +| `Squeak32-5.0` | `Pharo64-6.1` | | | | +| `Squeak32-4.6` | `Pharo64-6.0` | | | | +| `Squeak32-4.5` | `Pharo32-alpha` | | | | +| | `Pharo32-stable` | | | | | | `Pharo32-12` | | | | | | `Pharo32-11` | | | | | | `Pharo32-10` | | | | @@ -99,7 +100,6 @@ they can take up a lot of space on your drive.* | | `Pharo32-4.0` | | | | | | `Pharo32-3.0` | | | | - ## Templates ### Minimal `.smalltalk.ston` Template diff --git a/pharo/run.sh b/pharo/run.sh index 33534207..73f8b37c 100644 --- a/pharo/run.sh +++ b/pharo/run.sh @@ -21,6 +21,9 @@ pharo::get_image_url() { "Pharo64-stable"|"Pharo-stable") echo "get.pharo.org/64/stable" ;; + "Pharo64-14") + echo "get.pharo.org/64/140" + ;; "Pharo64-13") echo "get.pharo.org/64/130" ;; @@ -54,6 +57,9 @@ pharo::get_image_url() { "Pharo32-stable") echo "get.pharo.org/stable" ;; + "Pharo32-14") + echo "get.pharo.org/32/140" + ;; "Pharo32-13") echo "get.pharo.org/32/130" ;; diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st index 8936a1e1..ecace3ec 100644 --- a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st @@ -2,7 +2,7 @@ baseline setUpPharo5AndGreaterPackages: spec spec - for: #(#'pharo5.x' #'pharo6.x' #'pharo7.x' #'pharo8.x' #'pharo9.x' #'pharo10.x' #'pharo11.x' #'pharo12.x' #'pharo13.x') + for: #(#'pharo5.x' #'pharo6.x' #'pharo7.x' #'pharo8.x' #'pharo9.x' #'pharo10.x' #'pharo11.x' #'pharo12.x' #'pharo13.x' #'pharo14.x') do: [ spec package: 'SmalltalkCI-Core' with: [ spec includes: #('SmalltalkCI-Pharo-Core') ]; package: 'SmalltalkCI-Pharo-Core' with: [ spec requires: 'SmalltalkCI-Core' ]; diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/properties.json b/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/properties.json deleted file mode 100644 index 1b24246b..00000000 --- a/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "SmalltalkCI-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "SCIMetacelloIgnorePackageLoaded", - "pools" : [ - ], - "super" : "Notification", - "type" : "normal" } diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/methodProperties.json new file mode 100644 index 00000000..40efa27e --- /dev/null +++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + "codeCoverageClass" : "MaxLeske 4/29/2024 19:25", + "isPlatformCompatible" : "MaxLeske 4/29/2024 19:25"}, + "instance" : { + } } diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/properties.json index 5a038994..e6fcef34 100644 --- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/properties.json +++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/properties.json @@ -8,4 +8,4 @@ "instvars" : [ ], "name" : "SmalltalkCIPharo13", "type" : "normal" -} \ No newline at end of file +} diff --git a/run.sh b/run.sh index 8f52d5e9..f25cafee 100755 --- a/run.sh +++ b/run.sh @@ -223,8 +223,8 @@ select_smalltalk() { local images="Squeak64-trunk Squeak64-6.0 Squeak64-5.3 Squeak64-5.2 Squeak64-5.1 Squeak32-trunk Squeak32-6.0 Squeak32-5.3 Squeak32-5.2 Squeak32-5.1 Squeak32-5.0 Squeak32-4.6 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-13 Pharo32-12 Pharo32-9.0 Pharo32-8.0 Pharo32-7.0 Pharo32-6.0 Pharo32-5.0 + Pharo64-stable Pharo64-alpha Pharo64-14 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-14 Pharo32-13 Pharo32-12 Pharo32-9.0 Pharo32-8.0 Pharo32-7.0 Pharo32-6.0 Pharo32-5.0 Pharo32-4.0 Pharo32-3.0 GemStone64-3.6.5 GemStone64-3.6.0 GemStone64-3.5.8 GemStone64-3.5.3 GToolkit64-release @@ -586,4 +586,4 @@ main() { # Run main if script is not being tested if [[ "$(basename -- "$0")" != *"test"* ]]; then main "$@" -fi \ No newline at end of file +fi diff --git a/tests/pharo_tests.sh b/tests/pharo_tests.sh index 196413b5..a1323911 100755 --- a/tests/pharo_tests.sh +++ b/tests/pharo_tests.sh @@ -19,6 +19,12 @@ test_get_image_url() { image_url="$(pharo::get_image_url "Pharo64-stable")" assertEquals "get.pharo.org/64/stable" "${image_url}" + image_url="$(pharo::get_image_url "Pharo64-14")" + assertEquals "get.pharo.org/64/120" "${image_url}" + + image_url="$(pharo::get_image_url "Pharo64-13")" + assertEquals "get.pharo.org/64/120" "${image_url}" + image_url="$(pharo::get_image_url "Pharo64-12")" assertEquals "get.pharo.org/64/120" "${image_url}" @@ -34,6 +40,11 @@ test_get_image_url() { image_url="$(pharo::get_image_url "Pharo64-8.0")" assertEquals "get.pharo.org/64/80" "${image_url}" + image_url="$(pharo::get_image_url "Pharo32-14")" + assertEquals "get.pharo.org/32/120" "${image_url}" + + image_url="$(pharo::get_image_url "Pharo32-13")" + assertEquals "get.pharo.org/32/120" "${image_url}" image_url="$(pharo::get_image_url "Pharo32-12")" assertEquals "get.pharo.org/32/120" "${image_url}" @@ -90,6 +101,9 @@ test_get_vm_url() { vm_url="$(pharo::get_vm_url "Pharo64-stable")" assertEquals "get.pharo.org/64/vm120" "${vm_url}" + vm_url="$(pharo::get_vm_url "Pharo64-14")" + assertEquals "get.pharo.org/64/vm130" "${vm_url}" + vm_url="$(pharo::get_vm_url "Pharo64-13")" assertEquals "get.pharo.org/64/vm130" "${vm_url}" @@ -108,6 +122,8 @@ test_get_vm_url() { vm_url="$(pharo::get_vm_url "Pharo64-8.0")" assertEquals "get.pharo.org/64/vm80" "${vm_url}" + vm_url="$(pharo::get_vm_url "Pharo32-14")" + assertEquals "get.pharo.org/vm130" "${vm_url}" vm_url="$(pharo::get_vm_url "Pharo32-13")" assertEquals "get.pharo.org/vm130" "${vm_url}"