From ad8c07672fa86f8617adf0ee4f73efdee1ef2397 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 29 May 2025 00:02:43 +0200 Subject: [PATCH 1/2] Use truffleruby-dev-builder for all platforms for truffleruby-dev and truffleruby+graalvm-dev * Since linux-aarch64 is also available on GitHub Actions now. --- share/ruby-build/truffleruby+graalvm-dev | 13 ++++--------- share/ruby-build/truffleruby-dev | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/share/ruby-build/truffleruby+graalvm-dev b/share/ruby-build/truffleruby+graalvm-dev index a6e65edb76..f65b66d633 100644 --- a/share/ruby-build/truffleruby+graalvm-dev +++ b/share/ruby-build/truffleruby+graalvm-dev @@ -1,24 +1,19 @@ platform="$(uname -s)-$(uname -m)" case $platform in Linux-x86_64) - url="https://github.com/graalvm/graal-languages-ea-builds/raw/HEAD/truffleruby/versions/latest-jvm-linux-amd64.url" + install_package "truffleruby+graalvm-dev" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby+graalvm-head-ubuntu-24.04.tar.gz" truffleruby ;; Linux-aarch64) - url="https://github.com/graalvm/graal-languages-ea-builds/raw/HEAD/truffleruby/versions/latest-jvm-linux-aarch64.url" + install_package "truffleruby+graalvm-dev" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby+graalvm-head-ubuntu-24.04-arm64.tar.gz" truffleruby ;; Darwin-x86_64) - url="https://github.com/graalvm/graal-languages-ea-builds/raw/HEAD/truffleruby/versions/latest-jvm-darwin-amd64.url" + install_package "truffleruby+graalvm-dev" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby+graalvm-head-macos-latest.tar.gz" truffleruby ;; Darwin-arm64) - url="https://github.com/graalvm/graal-languages-ea-builds/raw/HEAD/truffleruby/versions/latest-jvm-darwin-aarch64.url" + install_package "truffleruby+graalvm-dev" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby+graalvm-head-macos-13-arm64.tar.gz" truffleruby ;; *) colorize 1 "Unsupported platform: $platform" return 1 ;; esac - -urlfile="$(mktemp "${TMP}/truffleruby.XXXXXX")" -http get "$url" "$urlfile" -install_package "truffleruby+graalvm-dev" "$(<"$urlfile")" truffleruby -rm -f "$urlfile" diff --git a/share/ruby-build/truffleruby-dev b/share/ruby-build/truffleruby-dev index 1f179c098b..65c7fedd14 100644 --- a/share/ruby-build/truffleruby-dev +++ b/share/ruby-build/truffleruby-dev @@ -4,7 +4,7 @@ Linux-x86_64) install_package "truffleruby-head" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-ubuntu-24.04.tar.gz" truffleruby ;; Linux-aarch64) - install_package "truffleruby-head" "https://github.com/graalvm/graalvm-ce-dev-builds/releases/latest/download/truffleruby-community-dev-linux-aarch64.tar.gz" truffleruby + install_package "truffleruby-head" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-ubuntu-24.04-arm64.tar.gz" truffleruby ;; Darwin-x86_64) install_package "truffleruby-head" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-macos-latest.tar.gz" truffleruby From d49d1da2e0cbba0881dd576ccf101251ac787072 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 29 May 2025 00:06:57 +0200 Subject: [PATCH 2/2] Rename package name to truffleruby-dev for consistency with the definition filename --- share/ruby-build/truffleruby-dev | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/ruby-build/truffleruby-dev b/share/ruby-build/truffleruby-dev index 65c7fedd14..f1c007054b 100644 --- a/share/ruby-build/truffleruby-dev +++ b/share/ruby-build/truffleruby-dev @@ -1,16 +1,16 @@ platform="$(uname -s)-$(uname -m)" case $platform in Linux-x86_64) - install_package "truffleruby-head" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-ubuntu-24.04.tar.gz" truffleruby + install_package "truffleruby-dev" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-ubuntu-24.04.tar.gz" truffleruby ;; Linux-aarch64) - install_package "truffleruby-head" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-ubuntu-24.04-arm64.tar.gz" truffleruby + install_package "truffleruby-dev" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-ubuntu-24.04-arm64.tar.gz" truffleruby ;; Darwin-x86_64) - install_package "truffleruby-head" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-macos-latest.tar.gz" truffleruby + install_package "truffleruby-dev" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-macos-latest.tar.gz" truffleruby ;; Darwin-arm64) - install_package "truffleruby-head" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-macos-13-arm64.tar.gz" truffleruby + install_package "truffleruby-dev" "https://github.com/ruby/truffleruby-dev-builder/releases/latest/download/truffleruby-head-macos-13-arm64.tar.gz" truffleruby ;; *) colorize 1 "Unsupported platform: $platform"