Skip to content
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

Jump to bottom

[Bug]: GToolkit Download Target Should Include Zip Extension #642

Merged
merged 4 commits into from
May 21, 2024
Merged

[Bug]: GToolkit Download Target Should Include Zip Extension #642

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a912df
[Bug]: GToolkit Download Target Should Include Zip Extension
seandenigris May 16, 2024
f651e14
Avoid GT DL if Cached, Discard Output during Zip Extraction
seandenigris May 16, 2024
4381d41
GT - Declare local smalltalk_version
seandenigris May 16, 2024
71bf315
GT: Use smalltalk_version in Cache Overwrite Output Message
seandenigris May 16, 2024
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
15 changes: 8 additions & 7 deletions gtoolkit/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,25 +108,26 @@ gtoolkit::prepare_gt() {
local download_name
local target
seandenigris marked this conversation as resolved.
Show resolved Hide resolved
gtoolkit_image_url="$(gtoolkit::archive_url)"
smalltalk_version="$(basename "${gtoolkit_image_url}" .zip)"
download_name="$(basename "${gtoolkit_image_url}")"
target="${SMALLTALK_CI_CACHE}/${download_name}"
target="${SMALLTALK_CI_CACHE}/${smalltalk_version}"

if "${config_overwrite_cache}" && is_dir "${target}"; then
print_info "Removing cached image resources for ${smalltalk_name} (update forced)"
print_info "Removing cached image resources for ${smalltalk_version} (update forced)"
seandenigris marked this conversation as resolved.
Show resolved Hide resolved
rm -r "${target}"
fi
if ! is_dir "${target}"; then
mkdir "${target}"
fi
if ! is_file "${target}"/*.image; then
fold_start download_image "Downloading ${smalltalk_name} image..."
download_file "${gtoolkit_image_url}" "${target}"
if ! is_file "${target}/${download_name}"; then
fold_start download_image "Downloading ${smalltalk_version}..."
download_file "${gtoolkit_image_url}" "${target}/${download_name}"
fold_end download_image
fi

print_info "Extracting GT..."
extract_file "${target}" "${SMALLTALK_CI_BUILD}"
echo "${download_name}" > "${SMALLTALK_CI_BUILD}"/version
extract_file "${target}/${download_name}" "${SMALLTALK_CI_BUILD}" > /dev/null
echo "${smalltalk_version}" > "${SMALLTALK_CI_BUILD}"/version

print_info "Preparing GToolkit image..."
if ! is_file "${SMALLTALK_CI_IMAGE}"; then
Expand Down
Loading