diff --git a/README.md b/README.md index 804cd02e..8ff8c9cb 100644 --- a/README.md +++ b/README.md @@ -77,13 +77,13 @@ 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.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` | `Moose64-7.0` | | -| `Squeak32-5.3` | `Pharo64-8.0` | | `Moose32-trunk` | | -| `Squeak32-5.2` | `Pharo64-7.0` | | `Moose32-6.1` | | -| `Squeak32-5.1` | `Pharo64-6.1` | | `Moose32-6.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` | | | | diff --git a/pharo/run.sh b/pharo/run.sh index 65bb277a..7284a7b3 100644 --- a/pharo/run.sh +++ b/pharo/run.sh @@ -111,18 +111,6 @@ moose::get_image_url() { "Moose64-trunk"|"Moose-trunk") echo "https://github.com/moosetechnology/Moose/releases/download/continuous/Moose12-development-Pharo64-12.zip" ;; - "Moose32-trunk") - moose_name="moose-7.0" - echo "https://ci.inria.fr/moose/job/${moose_name}/lastSuccessfulBuild/artifact/${moose_name}.zip" - ;; - "Moose64-7"*) - moose_name="moose-$(echo "${smalltalk_name}" | cut -f2 -d-)-64bit" - echo "https://ci.inria.fr/moose/job/${moose_name}/lastSuccessfulBuild/artifact/${moose_name}.zip" - ;; - "Moose32-6"*|"Moose-6"*|"Moose32-7"*|"Moose-7"*) - moose_name="moose-$(echo "${smalltalk_name}" | cut -f2 -d-)" - echo "https://ci.inria.fr/moose/job/${moose_name}/lastSuccessfulBuild/artifact/${moose_name}.zip" - ;; "Moose64-8"*) echo "https://github.com/moosetechnology/Moose/releases/download/v8.x.x/Moose8-old-stable-Pharo64-8.0.zip" ;; @@ -183,7 +171,7 @@ pharo::get_vm_url() { "Pharo64-8.0"|"Moose64-8.0") echo "get.pharo.org/64/vm80" ;; - "Pharo64-7.0"|"Moose64-7.0") + "Pharo64-7.0") echo "get.pharo.org/64/vm70" ;; "Pharo64-6.1") @@ -213,19 +201,19 @@ pharo::get_vm_url() { "Pharo32-9.0") echo "get.pharo.org/vm90" ;; - "Pharo32-8.0"|"Moose32-8.0"|"Moose32-trunk") + "Pharo32-8.0") echo "get.pharo.org/vm80" ;; - "Pharo32-7.0"|"Pharo-7.0"|"Moose32-7.0"|"Moose-7.0") + "Pharo32-7.0"|"Pharo-7.0") echo "get.pharo.org/vm70" ;; - "Pharo32-6.1"|"Moose32-6.1"|"Pharo-6.1"|"Moose-6.1") + "Pharo32-6.1"|"Pharo-6.1") echo "get.pharo.org/vm61" ;; "Pharo32-6.0"|"Pharo-6.0") echo "get.pharo.org/vm60" ;; - "Pharo32-5.0"|"Moose32-6.0"|"Pharo-5.0"|"Moose-6.0") + "Pharo32-5.0"|"Pharo-5.0") echo "get.pharo.org/vm50" ;; "Pharo32-4.0"|"Pharo-4.0") diff --git a/run.sh b/run.sh index 5555c252..8f52d5e9 100755 --- a/run.sh +++ b/run.sh @@ -228,8 +228,7 @@ select_smalltalk() { Pharo32-4.0 Pharo32-3.0 GemStone64-3.6.5 GemStone64-3.6.0 GemStone64-3.5.8 GemStone64-3.5.3 GToolkit64-release - Moose64-trunk Moose64-12 Moose64-11 Moose64-10 Moose64-9.0 Moose64-8.0 Moose64-7.0 - Moose32-trunk Moose32-8.0 Moose32-7.0 Moose32-6.1 Moose32-6.0" + Moose64-trunk Moose64-12 Moose64-11 Moose64-10 Moose64-9.0 Moose64-8.0" if is_not_empty "${config_smalltalk}"; then return @@ -587,4 +586,4 @@ main() { # Run main if script is not being tested if [[ "$(basename -- "$0")" != *"test"* ]]; then main "$@" -fi +fi \ No newline at end of file