Skip to content

enable Pharo 14 #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

enable Pharo 14 #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e3c753
feat: add Pharo13 support
estebanlm Apr 23, 2024
41e972e
fix: properly collect classes from packages
theseion Apr 29, 2024
aef5505
chore: ignore failures of GemStone64-3.5.3 on macOS
theseion May 7, 2024
b700694
fix: remove flaky SCITestReporterSdtoutTest
theseion May 8, 2024
b06ab14
feat: increase job timeout for Squeak64-trunk
theseion May 9, 2024
d492a9d
Merge branch 'master' of github.com:hpi-swa/smalltalkCI
estebanlm May 12, 2025
dca51a2
enable Pharo 14
estebanlm May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
- Squeak32-4.5
- Pharo64-stable
- Pharo64-alpha
- Pharo64-14
- Pharo64-13
- Pharo64-12
- Pharo64-11
Expand All @@ -48,10 +49,12 @@ jobs:
- Moose64-10
- Moose64-9.0
- Moose64-8.0
- GemStone64-3.5.3
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure that you want to add this GemStone version? There's probably a good reason for its absence.

- GemStone64-3.5.8
- GemStone64-3.6.8
- GemStone64-3.7.1
- GToolkit64-release
timeout-minutes: [ 15 ]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't do anything

exclude: # exclude 32bit builds on macOS and GemStone builds on windows
- os: macos-latest
smalltalk: Squeak32-trunk
Expand All @@ -73,6 +76,8 @@ jobs:
smalltalk: Pharo64-10
- os: windows-2019
smalltalk: Pharo64-6.0
- os: windows-2019
smalltalk: GemStone64-3.5.3
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here: are you sure?

- os: windows-2019
smalltalk: GemStone64-3.5.8
- os: windows-2019
Expand Down
24 changes: 12 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` | | | |
Expand All @@ -99,7 +100,6 @@ they can take up a lot of space on your drive.*
| | `Pharo32-4.0` | | | |
| | `Pharo32-3.0` | | | |


## Templates

### <a name="minimal-smalltalkston-template"/>Minimal `.smalltalk.ston` Template
Expand Down
6 changes: 6 additions & 0 deletions pharo/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down Expand Up @@ -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"
;;
Expand Down
2 changes: 1 addition & 1 deletion ...malltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ];
Expand Down
14 changes: 0 additions & 14 deletions repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/properties.json
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put back

This file was deleted.

6 changes: 6 additions & 0 deletions repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/methodProperties.json
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"class" : {
"codeCoverageClass" : "MaxLeske 4/29/2024 19:25",
"isPlatformCompatible" : "MaxLeske 4/29/2024 19:25"},
"instance" : {
} }
2 changes: 1 addition & 1 deletion repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
"instvars" : [ ],
"name" : "SmalltalkCIPharo13",
"type" : "normal"
}
}
6 changes: 3 additions & 3 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -586,4 +586,4 @@ main() {
# Run main if script is not being tested
if [[ "$(basename -- "$0")" != *"test"* ]]; then
main "$@"
fi
fi
16 changes: 16 additions & 0 deletions tests/pharo_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assertEquals "get.pharo.org/64/120" "${image_url}"
assertEquals "get.pharo.org/64/140" "${image_url}"


image_url="$(pharo::get_image_url "Pharo64-13")"
assertEquals "get.pharo.org/64/120" "${image_url}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assertEquals "get.pharo.org/64/120" "${image_url}"
assertEquals "get.pharo.org/64/130" "${image_url}"


image_url="$(pharo::get_image_url "Pharo64-12")"
assertEquals "get.pharo.org/64/120" "${image_url}"

Expand All @@ -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}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assertEquals "get.pharo.org/32/120" "${image_url}"
assertEquals "get.pharo.org/32/140" "${image_url}"


image_url="$(pharo::get_image_url "Pharo32-13")"
assertEquals "get.pharo.org/32/120" "${image_url}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assertEquals "get.pharo.org/32/120" "${image_url}"
assertEquals "get.pharo.org/32/130" "${image_url}"


image_url="$(pharo::get_image_url "Pharo32-12")"
assertEquals "get.pharo.org/32/120" "${image_url}"
Expand Down Expand Up @@ -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}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assertEquals "get.pharo.org/64/vm130" "${vm_url}"
assertEquals "get.pharo.org/64/vm140" "${vm_url}"


vm_url="$(pharo::get_vm_url "Pharo64-13")"
assertEquals "get.pharo.org/64/vm130" "${vm_url}"

Expand All @@ -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}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assertEquals "get.pharo.org/vm130" "${vm_url}"
assertEquals "get.pharo.org/vm140" "${vm_url}"


vm_url="$(pharo::get_vm_url "Pharo32-13")"
assertEquals "get.pharo.org/vm130" "${vm_url}"
Expand Down
Loading