diff --git a/ChangeLog.md b/ChangeLog.md index 33d12c69..36f6a77d 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -590,6 +590,6 @@ [JRuby]: https://jruby.org/ [MagLev]: https://maglev.github.io/ [MRuby]: https://github.com/mruby/mruby#readme -[truffleruby]: https://github.com/oracle/truffleruby#readme +[truffleruby]: https://github.com/truffleruby/truffleruby#readme [ruby-versions]: https://github.com/postmodern/ruby-versions#readme diff --git a/README.md b/README.md index b7f0dcbb..fffb00e8 100644 --- a/README.md +++ b/README.md @@ -246,7 +246,7 @@ of [rbenv] [Ruby]: https://www.ruby-lang.org/ [JRuby]: https://jruby.org/ -[TruffleRuby]: https://github.com/oracle/truffleruby +[TruffleRuby]: https://github.com/truffleruby/truffleruby [mruby]: https://github.com/mruby/mruby#readme [Ubuntu]: https://ubuntu.com/ diff --git a/share/ruby-install/truffleruby-graalvm/dependencies.sh b/share/ruby-install/truffleruby-graalvm/dependencies.sh index 98937fe0..4ac45d21 100644 --- a/share/ruby-install/truffleruby-graalvm/dependencies.sh +++ b/share/ruby-install/truffleruby-graalvm/dependencies.sh @@ -1,74 +1,4 @@ #!/usr/bin/env bash -case "$package_manager" in - apt) - ruby_dependencies=( - make - gcc - zlib1g-dev - libssl-dev - libxml2 - libyaml-dev - ) - ;; - dnf|yum) - ruby_dependencies=( - make - gcc - zlib-devel - openssl-devel - libxml2 - libyaml-devel - ) - ;; - pacman) - ruby_dependencies=( - make - gcc - zlib - openssl - libxml2 - libyaml - ) - ;; - zypper) - ruby_dependencies=( - make - gcc - zlib-devel - libopenssl-devel - libxml2 - libyaml-devel - ) - ;; - pkg) - ruby_dependencies=( - gmake - gcc - openssl - libxml2 - libyaml - ) - ;; - brew) - ruby_dependencies=( - openssl@3 - libyaml - ) - ;; - port) - ruby_dependencies=( - openssl - libyaml - ) - ;; - xbps) - ruby_dependencies=( - base-devel - openssl-devel - zlib-devel - libxml2 - libyaml-devel - ) - ;; -esac +# Same as truffleruby dependencies +source "${BASH_SOURCE[0]%/*}/../truffleruby/dependencies.sh" diff --git a/share/ruby-install/truffleruby-graalvm/functions.sh b/share/ruby-install/truffleruby-graalvm/functions.sh index 50d94b6e..5e50323c 100644 --- a/share/ruby-install/truffleruby-graalvm/functions.sh +++ b/share/ruby-install/truffleruby-graalvm/functions.sh @@ -28,7 +28,7 @@ if [[ "$ruby_version" == "23.0.0" ]]; then elif (( truffleruby_major > 23 || (truffleruby_major == 23 && truffleruby_minor >= 1) )); then # 23.1+ ruby_dir_name="truffleruby-$ruby_version-${graalvm_platform/darwin/macos}-$graalvm_arch" ruby_archive="${ruby_archive:-truffleruby-jvm-$ruby_version-${graalvm_platform/darwin/macos}-$graalvm_arch.tar.gz}" - ruby_mirror="${ruby_mirror:-https://github.com/oracle/truffleruby/releases/download}" + ruby_mirror="${ruby_mirror:-https://github.com/truffleruby/truffleruby/releases/download}" ruby_url="${ruby_url:-$ruby_mirror/graal-$ruby_version/$ruby_archive}" else ruby_dir_name="graalvm-ce-java11-$ruby_version" @@ -43,7 +43,7 @@ fi function install_ruby() { if [[ "$install_dir" == '/usr/local' ]]; then - error "Unsupported see https://github.com/oracle/truffleruby/issues/1389" + error "Unsupported see https://github.com/truffleruby/truffleruby/issues/1389" return 1 fi diff --git a/share/ruby-install/truffleruby/dependencies.sh b/share/ruby-install/truffleruby/dependencies.sh index b8865790..e49304d5 100644 --- a/share/ruby-install/truffleruby/dependencies.sh +++ b/share/ruby-install/truffleruby/dependencies.sh @@ -1,24 +1,24 @@ #!/usr/bin/env bash +# See https://github.com/truffleruby/truffleruby/blob/master/README.md#dependencies + +truffleruby_major="${ruby_version%%.*}" + case "$package_manager" in apt) ruby_dependencies=( make gcc zlib1g-dev - libssl-dev - libxml2 - libyaml-dev + ca-certificates ) ;; - dnf|yum) + dnf|yum|zypper) ruby_dependencies=( make gcc zlib-devel - openssl-devel - libxml2 - libyaml-devel + ca-certificates ) ;; pacman) @@ -26,49 +26,66 @@ case "$package_manager" in make gcc zlib - openssl - libxml2 - libyaml - ) - ;; - zypper) - ruby_dependencies=( - make - gcc - zlib-devel - libopenssl-devel - libxml2 - libyaml-devel + ca-certificates ) ;; port) ruby_dependencies=( - openssl - libyaml + curl-ca-bundle ) ;; brew) ruby_dependencies=( - openssl@3 - libyaml + ca-certificates ) ;; pkg) ruby_dependencies=( gmake gcc - openssl - libxml2 - libyaml + ca-certificates ) ;; xbps) ruby_dependencies=( base-devel - openssl-devel zlib-devel - libxml2 - libyaml-devel + ca-certificates ) ;; esac + +if (( truffleruby_major < 33 )); then + case "$package_manager" in + apt) + ruby_dependencies+=( + libssl-dev + libyaml-dev + ) + ;; + dnf|yum|xbps) + ruby_dependencies+=( + openssl-devel + libyaml-devel + ) + ;; + pacman|port|pkg) + ruby_dependencies+=( + openssl + libyaml + ) + ;; + zypper) + ruby_dependencies+=( + libopenssl-devel + libyaml-devel + ) + ;; + brew) + ruby_dependencies+=( + openssl@3 + libyaml + ) + ;; + esac +fi diff --git a/share/ruby-install/truffleruby/functions.sh b/share/ruby-install/truffleruby/functions.sh index 6022dd49..10b8263d 100644 --- a/share/ruby-install/truffleruby/functions.sh +++ b/share/ruby-install/truffleruby/functions.sh @@ -16,30 +16,17 @@ esac ruby_dir_name="truffleruby-$ruby_version-$truffleruby_platform-$truffleruby_arch" ruby_archive="${ruby_archive:-$ruby_dir_name.tar.gz}" truffleruby_major="${ruby_version%%.*}" -truffleruby_without_major="${ruby_version#*.}" -truffleruby_minor="${truffleruby_without_major%%.*}" if [[ "$ruby_version" == "23.0.0" ]]; then log "TruffleRuby 23.0 and later installed by ruby-install use the faster Oracle GraalVM distribution" log "Oracle GraalVM uses the GFTC license, which is free for development and production use, see https://medium.com/graalvm/161527df3d76" +fi - ruby_mirror="${ruby_mirror:-https://gds.oracle.com/api/20220101/artifacts}" - truffleruby_artifact_id="" - - case "$truffleruby_platform-$truffleruby_arch" in - linux-amd64) truffleruby_artifact_id="FD4AB182EA4CEDFDE0531518000AF13E" ;; - linux-aarch64) truffleruby_artifact_id="FD40BA2367C226B6E0531518000AE71A" ;; - macos-amd64) truffleruby_artifact_id="FD4AB182EA51EDFDE0531518000AF13E" ;; - macos-aarch64) truffleruby_artifact_id="FD40BBF6750C366CE0531518000ABEAF" ;; - *) fail "Unsupported platform $truffleruby_platform-$truffleruby_arch" ;; - esac - - ruby_url="${ruby_url:-$ruby_mirror/$truffleruby_artifact_id/content}" -elif (( truffleruby_major > 23 || (truffleruby_major == 23 && truffleruby_minor >= 1) )); then # 23.1+ - ruby_mirror="${ruby_mirror:-https://github.com/oracle/truffleruby/releases/download}" +if (( truffleruby_major >= 23 )); then + ruby_mirror="${ruby_mirror:-https://github.com/truffleruby/truffleruby/releases/download}" ruby_url="${ruby_url:-$ruby_mirror/graal-$ruby_version/$ruby_archive}" else - ruby_mirror="${ruby_mirror:-https://github.com/oracle/truffleruby/releases/download}" + ruby_mirror="${ruby_mirror:-https://github.com/truffleruby/truffleruby/releases/download}" ruby_url="${ruby_url:-$ruby_mirror/vm-$ruby_version/$ruby_archive}" fi @@ -49,7 +36,7 @@ fi function install_ruby() { if [[ "$install_dir" == '/usr/local' ]]; then - error "Unsupported see https://github.com/oracle/truffleruby/issues/1389" + error "Unsupported see https://github.com/truffleruby/truffleruby/issues/1389" return 1 fi diff --git a/test/truffleruby-graalvm-tests/dependencies_test.sh b/test/truffleruby-graalvm-tests/dependencies_test.sh deleted file mode 100755 index fb2bc976..00000000 --- a/test/truffleruby-graalvm-tests/dependencies_test.sh +++ /dev/null @@ -1,143 +0,0 @@ -#!/usr/bin/env bash - -. ./test/helper.sh -. ./share/ruby-install/ruby-install.sh - -function setUp() -{ - ruby="truffleruby-graalvm" - ruby_version="23.1.2" -} - -function test_when_package_manager_is_apt() -{ - local original_package_manager="$package_manager" - package_manager="apt" - - source "$ruby_install_dir/$ruby/dependencies.sh" - - assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib1g-dev libssl-dev libxml2 libyaml-dev" - - package_manager="$original_package_manager" -} - -function test_when_package_manager_is_dnf() -{ - local original_package_manager="$package_manager" - package_manager="dnf" - - source "$ruby_install_dir/$ruby/dependencies.sh" - - assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib-devel openssl-devel libxml2 libyaml-devel" - - package_manager="$original_package_manager" -} - -function test_when_package_manager_is_yum() -{ - local original_package_manager="$package_manager" - package_manager="yum" - - source "$ruby_install_dir/$ruby/dependencies.sh" - - assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib-devel openssl-devel libxml2 libyaml-devel" - - package_manager="$original_package_manager" -} - -function test_when_package_manager_is_port() -{ - local original_package_manager="$package_manager" - package_manager="port" - - source "$ruby_install_dir/$ruby/dependencies.sh" - - assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "openssl libyaml" - - package_manager="$original_package_manager" -} - -function test_when_package_manager_is_brew() -{ - local original_package_manager="$package_manager" - package_manager="brew" - - source "$ruby_install_dir/$ruby/dependencies.sh" - - assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "openssl@3 libyaml" - - package_manager="$original_package_manager" -} - -function test_when_package_manager_is_pacman() -{ - local original_package_manager="$package_manager" - package_manager="pacman" - - source "$ruby_install_dir/$ruby/dependencies.sh" - - assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib openssl libxml2 libyaml" - - package_manager="$original_package_manager" -} - -function test_when_package_manager_is_zypper() -{ - local original_package_manager="$package_manager" - package_manager="zypper" - - source "$ruby_install_dir/$ruby/dependencies.sh" - - assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib-devel libopenssl-devel libxml2 libyaml-devel" - - package_manager="$original_package_manager" -} - -function test_when_package_manager_is_pkg() -{ - local original_package_manager="$package_manager" - package_manager="pkg" - - source "$ruby_install_dir/$ruby/dependencies.sh" - - assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "gmake gcc openssl libxml2 libyaml" - - package_manager="$original_package_manager" -} - -function test_when_package_manager_is_xbps() -{ - local original_package_manager="$package_manager" - package_manager="xbps" - - source "$ruby_install_dir/$ruby/dependencies.sh" - - assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "base-devel openssl-devel zlib-devel libxml2 libyaml-devel" - - package_manager="$original_package_manager" -} - -function tearDown() -{ - unset ruby ruby_version ruby_dependencies -} - -SHUNIT_PARENT=$0 . $SHUNIT2 diff --git a/test/truffleruby-graalvm-tests/functions_test.sh b/test/truffleruby-graalvm-tests/functions_test.sh index 5bd58a17..ed1c82bd 100755 --- a/test/truffleruby-graalvm-tests/functions_test.sh +++ b/test/truffleruby-graalvm-tests/functions_test.sh @@ -249,7 +249,7 @@ function test_ruby_mirror_default_value_when_ruby_version_is_greater_or_equal_to source "$ruby_install_dir/truffleruby-graalvm/functions.sh" assertEquals "did not correctly set \$ruby_mirror" \ - "https://github.com/oracle/truffleruby/releases/download" \ + "https://github.com/truffleruby/truffleruby/releases/download" \ "$ruby_mirror" } @@ -314,7 +314,7 @@ function test_ruby_url_default_value_when_ruby_version_is_greater_or_equal_to_23 source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null assertEquals "did not correctly set \$ruby_url" \ - "https://github.com/oracle/truffleruby/releases/download/graal-$ruby_version/$ruby_archive" \ + "https://github.com/truffleruby/truffleruby/releases/download/graal-$ruby_version/$ruby_archive" \ "$ruby_url" } diff --git a/test/truffleruby-tests/dependencies_test.sh b/test/truffleruby-tests/dependencies_test.sh index d83c1f12..d36af9b5 100755 --- a/test/truffleruby-tests/dependencies_test.sh +++ b/test/truffleruby-tests/dependencies_test.sh @@ -17,8 +17,8 @@ function test_when_package_manager_is_apt() source "$ruby_install_dir/$ruby/dependencies.sh" assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib1g-dev libssl-dev libxml2 libyaml-dev" + "make gcc zlib1g-dev ca-certificates libssl-dev libyaml-dev" \ + "${ruby_dependencies[*]}" package_manager="$original_package_manager" } @@ -31,8 +31,8 @@ function test_when_package_manager_is_dnf() source "$ruby_install_dir/$ruby/dependencies.sh" assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib-devel openssl-devel libxml2 libyaml-devel" + "make gcc zlib-devel ca-certificates openssl-devel libyaml-devel" \ + "${ruby_dependencies[*]}" package_manager="$original_package_manager" } @@ -45,8 +45,8 @@ function test_when_package_manager_is_yum() source "$ruby_install_dir/$ruby/dependencies.sh" assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib-devel openssl-devel libxml2 libyaml-devel" + "make gcc zlib-devel ca-certificates openssl-devel libyaml-devel" \ + "${ruby_dependencies[*]}" package_manager="$original_package_manager" } @@ -59,8 +59,8 @@ function test_when_package_manager_is_port() source "$ruby_install_dir/$ruby/dependencies.sh" assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "openssl libyaml" + "curl-ca-bundle openssl libyaml" \ + "${ruby_dependencies[*]}" package_manager="$original_package_manager" } @@ -73,8 +73,8 @@ function test_when_package_manager_is_brew() source "$ruby_install_dir/$ruby/dependencies.sh" assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "openssl@3 libyaml" + "ca-certificates openssl@3 libyaml" \ + "${ruby_dependencies[*]}" package_manager="$original_package_manager" } @@ -87,8 +87,8 @@ function test_when_package_manager_is_pacman() source "$ruby_install_dir/$ruby/dependencies.sh" assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib openssl libxml2 libyaml" + "make gcc zlib ca-certificates openssl libyaml" \ + "${ruby_dependencies[*]}" package_manager="$original_package_manager" } @@ -101,8 +101,8 @@ function test_when_package_manager_is_zypper() source "$ruby_install_dir/$ruby/dependencies.sh" assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "make gcc zlib-devel libopenssl-devel libxml2 libyaml-devel" + "make gcc zlib-devel ca-certificates libopenssl-devel libyaml-devel" \ + "${ruby_dependencies[*]}" package_manager="$original_package_manager" } @@ -115,8 +115,8 @@ function test_when_package_manager_is_pkg() source "$ruby_install_dir/$ruby/dependencies.sh" assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "gmake gcc openssl libxml2 libyaml" + "gmake gcc ca-certificates openssl libyaml" \ + "${ruby_dependencies[*]}" package_manager="$original_package_manager" } @@ -129,8 +129,98 @@ function test_when_package_manager_is_xbps() source "$ruby_install_dir/$ruby/dependencies.sh" assertEquals "did not correctly set \$ruby_dependencies" \ - "${ruby_dependencies[*]}" \ - "base-devel openssl-devel zlib-devel libxml2 libyaml-devel" + "base-devel zlib-devel ca-certificates openssl-devel libyaml-devel" \ + "${ruby_dependencies[*]}" + + package_manager="$original_package_manager" +} + +function test_when_ruby_version_is_at_least_33_and_package_manager_is_apt() +{ + local original_package_manager="$package_manager" + package_manager="apt" + ruby_version="33.0.0" + + source "$ruby_install_dir/$ruby/dependencies.sh" + + assertEquals "did not correctly set \$ruby_dependencies" \ + "make gcc zlib1g-dev ca-certificates" \ + "${ruby_dependencies[*]}" + + package_manager="$original_package_manager" +} + +function test_when_ruby_version_is_at_least_33_and_package_manager_is_dnf() +{ + local original_package_manager="$package_manager" + package_manager="dnf" + ruby_version="33.0.0" + + source "$ruby_install_dir/$ruby/dependencies.sh" + + assertEquals "did not correctly set \$ruby_dependencies" \ + "make gcc zlib-devel ca-certificates" \ + "${ruby_dependencies[*]}" + + package_manager="$original_package_manager" +} + +function test_when_ruby_version_is_at_least_33_and_package_manager_is_pacman() +{ + local original_package_manager="$package_manager" + package_manager="pacman" + ruby_version="33.0.0" + + source "$ruby_install_dir/$ruby/dependencies.sh" + + assertEquals "did not correctly set \$ruby_dependencies" \ + "make gcc zlib ca-certificates" \ + "${ruby_dependencies[*]}" + + package_manager="$original_package_manager" +} + +function test_when_ruby_version_is_at_least_33_and_package_manager_is_port() +{ + local original_package_manager="$package_manager" + package_manager="port" + ruby_version="33.0.0" + + source "$ruby_install_dir/$ruby/dependencies.sh" + + assertEquals "did not correctly set \$ruby_dependencies" \ + "curl-ca-bundle" \ + "${ruby_dependencies[*]}" + + package_manager="$original_package_manager" +} + +function test_when_ruby_version_is_at_least_33_and_package_manager_is_brew() +{ + local original_package_manager="$package_manager" + package_manager="brew" + ruby_version="33.0.0" + + source "$ruby_install_dir/$ruby/dependencies.sh" + + assertEquals "did not correctly set \$ruby_dependencies" \ + "ca-certificates" \ + "${ruby_dependencies[*]}" + + package_manager="$original_package_manager" +} + +function test_when_ruby_version_is_at_least_33_and_package_manager_is_xbps() +{ + local original_package_manager="$package_manager" + package_manager="xbps" + ruby_version="33.0.0" + + source "$ruby_install_dir/$ruby/dependencies.sh" + + assertEquals "did not correctly set \$ruby_dependencies" \ + "base-devel zlib-devel ca-certificates" \ + "${ruby_dependencies[*]}" package_manager="$original_package_manager" } diff --git a/test/truffleruby-tests/functions_test.sh b/test/truffleruby-tests/functions_test.sh index 09471d8f..36bd9c5b 100755 --- a/test/truffleruby-tests/functions_test.sh +++ b/test/truffleruby-tests/functions_test.sh @@ -91,126 +91,6 @@ function test_truffleruby_arch_when_os_arch_is_arm64() os_arch="$original_os_arch" } -function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Linux_and_os_arch_is_x86_64() -{ - local original_os_arch="$os_arch" - local original_os_platform="$os_platform" - os_arch="x86_64" - os_platform="Linux" - - ruby_version="23.0.0" - - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not correctly set \$truffleruby_artifact_id" \ - "FD4AB182EA4CEDFDE0531518000AF13E" \ - "$truffleruby_artifact_id" - - os_arch="$original_os_arch" - os_platform="$original_os_platform" -} - -function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Linux_and_os_arch_is_aarch64() -{ - local original_os_arch="$os_arch" - local original_os_platform="$os_platform" - os_arch="aarch64" - os_platform="Linux" - - ruby_version="23.0.0" - - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not correctly set \$truffleruby_artifact_id" \ - "FD40BA2367C226B6E0531518000AE71A" \ - "$truffleruby_artifact_id" - - os_arch="$original_os_arch" - os_platform="$original_os_platform" -} - -function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Linux_and_os_arch_is_arm64() -{ - local original_os_arch="$os_arch" - local original_os_platform="$os_platform" - os_arch="arm64" - os_platform="Linux" - - ruby_version="23.0.0" - - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not correctly set \$truffleruby_artifact_id" \ - "FD40BA2367C226B6E0531518000AE71A" \ - "$truffleruby_artifact_id" - - os_arch="$original_os_arch" - os_platform="$original_os_platform" -} - -function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Darwin_and_os_arch_is_x86_64() -{ - local original_os_arch="$os_arch" - local original_os_platform="$os_platform" - os_arch="x86_64" - os_platform="Darwin" - - ruby_version="23.0.0" - - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not correctly set \$truffleruby_artifact_id" \ - "FD4AB182EA51EDFDE0531518000AF13E" \ - "$truffleruby_artifact_id" - - os_arch="$original_os_arch" - os_platform="$original_os_platform" -} - -function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Darwin_and_os_arch_is_aarch64() -{ - local original_os_arch="$os_arch" - local original_os_platform="$os_platform" - os_arch="aarch64" - os_platform="Darwin" - - ruby_version="23.0.0" - - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not correctly set \$truffleruby_artifact_id" \ - "FD40BBF6750C366CE0531518000ABEAF" \ - "$truffleruby_artifact_id" - - os_arch="$original_os_arch" - os_platform="$original_os_platform" -} - -function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Darwin_and_os_arch_is_arm64() -{ - local original_os_arch="$os_arch" - local original_os_platform="$os_platform" - os_arch="arm64" - os_platform="Darwin" - - ruby_version="23.0.0" - - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not correctly set \$truffleruby_artifact_id" \ - "FD40BBF6750C366CE0531518000ABEAF" \ - "$truffleruby_artifact_id" - - os_arch="$original_os_arch" - os_platform="$original_os_platform" -} - function test_truffleruby_major() { assertEquals "did not correctly set \$truffleruby_major" \ @@ -218,20 +98,6 @@ function test_truffleruby_major() "$truffleruby_major" } -function test_truffleruby_without_major() -{ - assertEquals "did not correctly set \$truffleruby_without_major" \ - "1.0" \ - "$truffleruby_without_major" -} - -function test_truffleruby_minor() -{ - assertEquals "did not correctly set \$truffleruby_minor" \ - "1" \ - "$truffleruby_minor" -} - function test_ruby_archive_default_value() { assertEquals "did not preserve the \$ruby_archive value" \ @@ -239,24 +105,11 @@ function test_ruby_archive_default_value() "$ruby_archive" } -function test_ruby_archive_when_its_already_set_and_when_ruby_version_is_23_0_0() +function test_ruby_archive_when_its_already_set_and_when_ruby_version_is_greater_equal_to_23_0_0() { ruby_version="23.0.0" ruby_archive="truffleruby-custom-1.2.3.tar.bz2" - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not correctly set \$ruby_archive" \ - "truffleruby-custom-1.2.3.tar.bz2" \ - "$ruby_archive" -} - -function test_ruby_archive_when_its_already_set_and_when_ruby_version_is_greater_equal_to_23_1_0() -{ - ruby_version="23.1.0" - ruby_archive="truffleruby-custom-1.2.3.tar.bz2" - source "$ruby_install_dir/functions.sh" source "$ruby_install_dir/truffleruby/functions.sh" @@ -285,29 +138,16 @@ function test_ruby_dir_name() "$ruby_dir_name" } -function test_ruby_mirror_default_value_when_ruby_version_is_23_0_0() +function test_ruby_mirror_default_value_when_ruby_version_is_greater_or_equal_to_23_0_0() { ruby_version="23.0.0" unset ruby_mirror - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not correctly set \$ruby_mirror" \ - "https://gds.oracle.com/api/20220101/artifacts" \ - "$ruby_mirror" -} - -function test_ruby_mirror_default_value_when_ruby_version_is_greater_or_equal_to_23_1_0() -{ - ruby_version="23.1.0" - unset ruby_mirror - source "$ruby_install_dir/functions.sh" source "$ruby_install_dir/truffleruby/functions.sh" assertEquals "did not correctly set \$ruby_mirror" \ - "https://github.com/oracle/truffleruby/releases/download" \ + "https://github.com/truffleruby/truffleruby/releases/download" \ "$ruby_mirror" } @@ -320,28 +160,15 @@ function test_ruby_mirror_default_value_when_ruby_version_is_less_than_23_0_0() source "$ruby_install_dir/truffleruby/functions.sh" assertEquals "did not correctly set \$ruby_mirror" \ - "https://github.com/oracle/truffleruby/releases/download" \ + "https://github.com/truffleruby/truffleruby/releases/download" \ "$ruby_mirror" } -function test_ruby_mirror_when_its_already_set_and_when_ruby_version_is_23_0_0() +function test_ruby_mirror_when_its_already_set_and_when_ruby_version_is_greater_or_equal_to_23_0_0() { ruby_version="23.0.0" ruby_mirror="https://example.com/pub/truffleruby" - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not preserve the \$ruby_mirror value" \ - "https://example.com/pub/truffleruby" \ - "$ruby_mirror" -} - -function test_ruby_mirror_when_its_already_set_and_when_ruby_version_is_greater_equal_to_23_1_0() -{ - ruby_version="23.1.0" - ruby_mirror="https://example.com/pub/truffleruby" - source "$ruby_install_dir/functions.sh" source "$ruby_install_dir/truffleruby/functions.sh" @@ -363,29 +190,16 @@ function test_ruby_mirror_when_its_already_set_and_when_ruby_version_is_less_tha "$ruby_mirror" } -function test_ruby_url_default_value_when_ruby_version_is_23_0_0() +function test_ruby_url_default_value_when_ruby_version_is_greater_or_equal_to_23_0_0() { ruby_version="23.0.0" unset ruby_mirror ruby_url - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not correctly set \$ruby_url" \ - "https://gds.oracle.com/api/20220101/artifacts/$truffleruby_artifact_id/content" \ - "$ruby_url" -} - -function test_ruby_url_default_value_when_ruby_version_is_greater_or_equal_to_23_1_0() -{ - ruby_version="23.1.0" - unset ruby_mirror ruby_url - source "$ruby_install_dir/functions.sh" source "$ruby_install_dir/truffleruby/functions.sh" assertEquals "did not correctly set \$ruby_url" \ - "https://github.com/oracle/truffleruby/releases/download/graal-$ruby_version/$ruby_archive" \ + "https://github.com/truffleruby/truffleruby/releases/download/graal-$ruby_version/$ruby_archive" \ "$ruby_url" } @@ -398,28 +212,15 @@ function test_ruby_url_default_value_when_ruby_version_is_less_than_23_0_0() source "$ruby_install_dir/truffleruby/functions.sh" assertEquals "did not correctly set \$ruby_url" \ - "https://github.com/oracle/truffleruby/releases/download/vm-$ruby_version/$ruby_archive" \ + "https://github.com/truffleruby/truffleruby/releases/download/vm-$ruby_version/$ruby_archive" \ "$ruby_url" } -function test_ruby_url_when_its_already_set_and_ruby_version_is_23_0_0() +function test_ruby_url_when_its_already_set_and_ruby_version_is_greater_equal_to_23_0_0() { ruby_version="23.0.0" ruby_url="https://example.com/pub/truffleruby/truffleruby-1.2.3.tar.gz" - source "$ruby_install_dir/functions.sh" - source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null - - assertEquals "did not preserve the \$ruby_url value" \ - "https://example.com/pub/truffleruby/truffleruby-1.2.3.tar.gz" \ - "$ruby_url" -} - -function test_ruby_url_when_its_already_set_and_ruby_version_is_greater_equal_to_23_1_0() -{ - ruby_version="23.1.0" - ruby_url="https://example.com/pub/truffleruby/truffleruby-1.2.3.tar.gz" - source "$ruby_install_dir/functions.sh" source "$ruby_install_dir/truffleruby/functions.sh"