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

Simplify truffleruby+graalvm-dev build definition re: download redirect #2361

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Simplify truffleruby+graalvm-dev build definition re: download redirect #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions bin/ruby-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,15 @@ http_head_aria2c() {
}

http_get_aria2c() {
# shellcheck disable=SC2086
log_command aria2c --allow-overwrite=true --no-conf=true --console-log-level=warn --stderr $ARIA2_OPTS -o "$2" "$1" 2>&3
local destfile="$2"
if [[ $destfile == /* ]]; then
# the "-o" option to aria2c cannot be an absolute path, but we can achieve that with "--dir"
# shellcheck disable=SC2086
log_command aria2c --allow-overwrite=true --no-conf=true --console-log-level=warn --stderr $ARIA2_OPTS --dir "${destfile%/*}" -o "${destfile##*/}" "$1" 2>&3
else
# shellcheck disable=SC2086
log_command aria2c --allow-overwrite=true --no-conf=true --console-log-level=warn --stderr $ARIA2_OPTS -o "$destfile" "$1" 2>&3
fi
Comment on lines +426 to +434
Copy link

@rwstauner rwstauner Mar 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Makes sense to me, and I confirmed it works with "file", "subdir/file" and "/abs/path".
You could reduce a bit of duplication:

Suggested change
local destfile="$2"
if [[ $destfile == /* ]]; then
# the "-o" option to aria2c cannot be an absolute path, but we can achieve that with "--dir"
# shellcheck disable=SC2086
log_command aria2c --allow-overwrite=true --no-conf=true --console-log-level=warn --stderr $ARIA2_OPTS --dir "${destfile%/*}" -o "${destfile##*/}" "$1" 2>&3
else
# shellcheck disable=SC2086
log_command aria2c --allow-overwrite=true --no-conf=true --console-log-level=warn --stderr $ARIA2_OPTS -o "$destfile" "$1" 2>&3
fi
local destfile="$2"
local args=()
if [[ $destfile == /* ]]; then
# the "-o" option to aria2c cannot be an absolute path, but we can achieve that with "--dir"
args+=(--dir "${destfile%/*}" -o "${destfile##*/}")
else
args+=(-o "$destfile")
fi
# shellcheck disable=SC2086
log_command aria2c --allow-overwrite=true --no-conf=true --console-log-level=warn --stderr $ARIA2_OPTS "${args[@]}" "$1" 2>&3

Copy link
Member Author

Choose a reason for hiding this comment

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

@rwstauner Thanks for the deduplication suggestion, but I find that I prefer seeing the full aria2c invocation line in both instances even if there is a little duplication, mostly for the ease of reading.

}

http_head_curl() {
Expand Down
18 changes: 8 additions & 10 deletions share/ruby-build/truffleruby+graalvm-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
platform="$(uname -s)-$(uname -m)"
case $platform in
Linux-x86_64)
url="https://raw.githubusercontent.com/graalvm/graal-languages-ea-builds/main/truffleruby/versions/latest-jvm-linux-amd64.url"
url="https://github.com/graalvm/graal-languages-ea-builds/raw/HEAD/truffleruby/versions/latest-jvm-linux-amd64.url"
Copy link
Member Author

Choose a reason for hiding this comment

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

Let's stick to using github.com URLs instead of raw.githubusercontent.com since the latter is an implementation detail of GitHub which might change in the future.

;;
Linux-aarch64)
url="https://raw.githubusercontent.com/graalvm/graal-languages-ea-builds/main/truffleruby/versions/latest-jvm-linux-aarch64.url"
url="https://github.com/graalvm/graal-languages-ea-builds/raw/HEAD/truffleruby/versions/latest-jvm-linux-aarch64.url"
;;
Darwin-x86_64)
url="https://raw.githubusercontent.com/graalvm/graal-languages-ea-builds/main/truffleruby/versions/latest-jvm-darwin-amd64.url"
url="https://github.com/graalvm/graal-languages-ea-builds/raw/HEAD/truffleruby/versions/latest-jvm-darwin-amd64.url"
;;
Darwin-arm64)
url="https://raw.githubusercontent.com/graalvm/graal-languages-ea-builds/main/truffleruby/versions/latest-jvm-darwin-aarch64.url"
url="https://github.com/graalvm/graal-languages-ea-builds/raw/HEAD/truffleruby/versions/latest-jvm-darwin-aarch64.url"
;;
*)
colorize 1 "Unsupported platform: $platform"
return 1
;;
esac

pushd "$BUILD_PATH" >/dev/null
http get $url url.txt
url=$(<url.txt)
popd

install_package "truffleruby+graalvm-dev" "$url" truffleruby
urlfile="$(mktemp "${TMP}/truffleruby.XXXXXX")"
Copy link
Member Author

Choose a reason for hiding this comment

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

We still save the download to a temporary file, but now we don't have to change the directory to work around aria2c limitation.

http get "$url" "$urlfile"
install_package "truffleruby+graalvm-dev" "$(<"$urlfile")" truffleruby
rm -f "$urlfile"