Merge pull request #643 from theseion/add-pharo-13

feat: add PharoXX-13 image selection
hpi-swa · May 26, 2024 · cdd3710 · cdd3710
2 parents 2979469 + f35fc8f
commit cdd3710
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,6 +31,7 @@ jobs:
           - Squeak32-4.5
           - Pharo64-stable
           - Pharo64-alpha
+          - Pharo64-13
           - Pharo64-12
           - Pharo64-11
           - Pharo64-10

diff --git 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-13")
+      echo "get.pharo.org/64/130"
+      ;;
     "Pharo64-12")
       echo "get.pharo.org/64/120"
       ;;
@@ -51,6 +54,9 @@ pharo::get_image_url() {
     "Pharo32-stable")
       echo "get.pharo.org/stable"
       ;;
+    "Pharo32-13")
+        echo "get.pharo.org/32/130"
+        ;;
     "Pharo32-12")
         echo "get.pharo.org/32/120"
         ;;
@@ -156,6 +162,9 @@ pharo::get_vm_url() {
     "Pharo64-stable"|"Pharo-stable")
       echo "get.pharo.org/64/vm${stable_version}0"
       ;;
+    "Pharo64-13")
+      echo "get.pharo.org/64/vm130"
+      ;;
     "Pharo64-12")
       echo "get.pharo.org/64/vm120"
       ;;
@@ -186,6 +195,9 @@ pharo::get_vm_url() {
     "Pharo32-stable")
       echo "get.pharo.org/vm${stable_version}0"
       ;;
+    "Pharo32-13")
+      echo "get.pharo.org/vm130"
+      ;;
     "Pharo32-12")
       echo "get.pharo.org/vm120"
       ;;

diff --git a/...SmalltalkCI-Tests.package/SCIGoferLoadSpecTest.class/instance/testAddLoadedClassesFrom.st b/...SmalltalkCI-Tests.package/SCIGoferLoadSpecTest.class/instance/testAddLoadedClassesFrom.st
@@ -1,9 +1,13 @@
 testing
 testAddLoadedClassesFrom
-	| gofer |
+	| goferClass gofer |
+	goferClass := Smalltalk
+		at: #Gofer
+		ifAbsent: [ ^ self ].
+
 	self assert: true equals: (self spec loadedClasses isEmpty).
 
-	gofer := Gofer new
+	gofer := goferClass new
 		package: 'SmalltalkCI-Core';
 		package: 'SmalltalkCI-Tests'.
 	self spec addLoadedClassesFrom: gofer references.

diff --git a/tests/pharo_tests.sh b/tests/pharo_tests.sh
@@ -90,6 +90,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-13")"
+  assertEquals "get.pharo.org/64/vm130" "${vm_url}"
+
   vm_url="$(pharo::get_vm_url "Pharo64-12")"
   assertEquals "get.pharo.org/64/vm120" "${vm_url}"
 
@@ -106,6 +109,9 @@ test_get_vm_url() {
   assertEquals "get.pharo.org/64/vm80" "${vm_url}"
 
 
+  vm_url="$(pharo::get_vm_url "Pharo32-13")"
+  assertEquals "get.pharo.org/vm130" "${vm_url}"
+
   vm_url="$(pharo::get_vm_url "Pharo32-12")"
   assertEquals "get.pharo.org/vm120" "${vm_url}"