From 1ae60a4a52826dca6dda17fa6bfd0d12c6e66c17 Mon Sep 17 00:00:00 2001 From: Christoph Thiede Date: Sun, 11 Sep 2022 17:51:50 +0000 Subject: [PATCH 1/2] squeak: always update images for builds Older Squeak images too can (and sometimes will) receive updates. Resolves #560. --- squeak/run.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/squeak/run.sh b/squeak/run.sh index 5bfde5f5..93019919 100755 --- a/squeak/run.sh +++ b/squeak/run.sh @@ -378,9 +378,7 @@ run_build() { if ! vm_is_user_provided; then squeak::prepare_vm fi - if is_trunk_build || image_is_user_provided; then - squeak::prepare_image - fi + squeak::prepare_image if ston_includes_loading; then squeak::load_project check_and_consume_build_status_file From 6d6c79b14f0fc577f7bdcf27fee9b39509cf532a Mon Sep 17 00:00:00 2001 From: Christoph Thiede Date: Sun, 11 Sep 2022 17:52:22 +0000 Subject: [PATCH 2/2] docs: Complements 428491c50d51416782903309433bef317fb72d87 --- squeak/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squeak/run.sh b/squeak/run.sh index 93019919..1cc41d83 100755 --- a/squeak/run.sh +++ b/squeak/run.sh @@ -122,7 +122,7 @@ squeak::download_trunk_image() { } ################################################################################ -# Ensure Metacello is installed and image is up-to-date. +# Ensure the image is up-to-date. ################################################################################ squeak::prepare_image() { local status=0