Merge branch 'master' into fix-testEmptyStatements

SeasideSt · Jan 15, 2024 · 5eb55c9 · 5eb55c9
2 parents 64ac15d + 9aac9aa
commit 5eb55c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.6.7, GemStone64-3.5.7, Squeak64-5.3 ]
+        smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.6.6, GemStone64-3.5.7, Squeak64-5.3 ]
         experimental: [ false ]
         include:
           - smalltalk: Pharo64-12
@@ -21,6 +21,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
+          smalltalkCI-source: 'jbrichau/smalltalkCI'
+          smalltalkCI-branch: 'fix-issue-623'
           smalltalk-image: ${{ matrix.smalltalk }}
       - name: Run tests
         run: smalltalkci -s ${{ matrix.smalltalk }}

diff --git a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st
@@ -17,12 +17,14 @@ resolveWith: aDictionary
 									aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [
 										"try -Pharo100-"
 										aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo100-') ifAbsent: [
-											"try -Squeak-"
-											aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
-												"try -Squeak5-"
-												aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
-													"try -Squeak6-"
-													aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
-														"specific for Grease-Slime"
-														aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
-															self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] ]
+											"try -Pharo110-"
+											aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo110-') ifAbsent: [
+												"try -Squeak-"
+												aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
+													"try -Squeak5-"
+													aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
+														"try -Squeak6-"
+														aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
+															"specific for Grease-Slime"
+															aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
+																self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] ] ]