feat: add Pharo13 support

hpi-swa · May 9, 2024 · 4e3c753 · 4e3c753
1 parent 8e603d8
commit 4e3c753
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 21 deletions.
diff --git a/README.md b/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-5.3`   | `Pharo64-13`     | `GemStone64-3.5.7`   | `Moose64-10`    |                      |
+| `Squeak64-5.2`   | `Pharo64-12`     | `GemStone64-3.5.6`   | `Moose64-9.0`   |                      |
+| `Squeak64-5.1`   | `Pharo64-11`     | `GemStone64-3.5.5`   | `Moose64-8.0`   |                      |
+| `Squeak32-trunk` | `Pharo64-10`     | `Gemstone64-3.5.4`   | `Moose64-7.0`   |                      |
+| `Squeak32-6.0`   | `Pharo64-9.0`    | `GemStone64-3.5.3`   | `Moose32-trunk` |                      |
+| `Squeak32-5.3`   | `Pharo64-8.0`    |                      | `Moose32-6.1`   |                      |
+| `Squeak32-5.2`   | `Pharo64-7.0`    |                      | `Moose32-6.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`    |                      |                 |                      |

diff --git a/pharo/run.sh b/pharo/run.sh
@@ -145,8 +145,8 @@ moose::get_image_url() {
 ################################################################################
 pharo::get_vm_url() {
   local smalltalk_name=$1
-  local stable_version=11
-  local alpha_version=12
+  local stable_version=12
+  local alpha_version=13
 
   case "${smalltalk_name}" in
     # NOTE: vmLatestXX should be updated every time new Pharo is released
@@ -166,7 +166,7 @@ pharo::get_vm_url() {
       echo "get.pharo.org/64/vm100"
       ;;
     "Pharo64-9.0"|"Moose64-9.0")
-      echo "get.pharo.org/vm90"
+      echo "get.pharo.org/64/vm90"
       ;;
     "Pharo64-8.0"|"Moose64-8.0")
       echo "get.pharo.org/64/vm80"

diff --git a/...malltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st b/...malltalkCI.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')
+		for: #(#'pharo5.x' #'pharo6.x' #'pharo7.x' #'pharo8.x' #'pharo9.x' #'pharo10.x' #'pharo11.x' #'pharo12.x', #'pharo13.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-Pharo-Core.package/SmalltalkCIPharo13.class/README.md b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/README.md
diff --git a/...ory/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/isPlatformCompatible.st b/...ory/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/isPlatformCompatible.st
@@ -0,0 +1,4 @@
+compatibility
+isPlatformCompatible
+
+	^ self platformNameBeginsWith: 'Pharo13'
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/methodProperties.json 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
@@ -0,0 +1,14 @@
+{
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "SmalltalkCIPharo13",
+	"pools" : [
+		 ],
+	"super" : "SmalltalkCIPharo12",
+	"type" : "normal" }
diff --git 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-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-12 Pharo32-9.0 Pharo32-8.0 Pharo32-7.0 Pharo32-6.0 Pharo32-5.0
+                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
                 Pharo32-4.0 Pharo32-3.0
                 GemStone64-3.6.5 GemStone64-3.6.0 GemStone64-3.5.8 GemStone64-3.5.3
                 GToolkit64-release

diff --git a/tests/pharo_tests.sh b/tests/pharo_tests.sh
@@ -34,6 +34,22 @@ 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-12")"
+  assertEquals "get.pharo.org/32/120" "${image_url}"
+
+  image_url="$(pharo::get_image_url "Pharo32-11")"
+  assertEquals "get.pharo.org/32/110" "${image_url}"
+
+  image_url="$(pharo::get_image_url "Pharo32-10")"
+  assertEquals "get.pharo.org/32/100" "${image_url}"
+
+  image_url="$(pharo::get_image_url "Pharo32-9.0")"
+  assertEquals "get.pharo.org/32/90" "${image_url}"
+
+  image_url="$(pharo::get_image_url "Pharo32-8.0")"
+  assertEquals "get.pharo.org/80" "${image_url}"
+
   image_url="$(pharo::get_image_url "Pharo32-7.0")"
   assertEquals "get.pharo.org/70" "${image_url}"
 
@@ -63,17 +79,33 @@ test_get_vm_url() {
   local vm_url
 
   vm_url="$(pharo::get_vm_url "Pharo32-alpha")"
-  assertEquals "get.pharo.org/vmLatest120" "${vm_url}"
+  assertEquals "get.pharo.org/vmLatest130" "${vm_url}"
 
   vm_url="$(pharo::get_vm_url "Pharo64-alpha")"
-  assertEquals "get.pharo.org/64/vmLatest120" "${vm_url}"
+  assertEquals "get.pharo.org/64/vmLatest130" "${vm_url}"
 
   vm_url="$(pharo::get_vm_url "Pharo32-stable")"
-  assertEquals "get.pharo.org/vm110" "${vm_url}"
+  assertEquals "get.pharo.org/vm120" "${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-12")"
+  assertEquals "get.pharo.org/64/vm120" "${vm_url}"
+
+  vm_url="$(pharo::get_vm_url "Pharo64-11")"
   assertEquals "get.pharo.org/64/vm110" "${vm_url}"
 
+  vm_url="$(pharo::get_vm_url "Pharo64-10")"
+  assertEquals "get.pharo.org/64/vm100" "${vm_url}"
+
+  vm_url="$(pharo::get_vm_url "Pharo64-9.0")"
+  assertEquals "get.pharo.org/64/vm90" "${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-12")"
   assertEquals "get.pharo.org/vm120" "${vm_url}"