Skip to content

Commit de7e057

Browse files
eregoneregon
committed
Use the proper and consistent URLs for TruffleRuby 23.0.0 now that they are available
1 parent 9078db7 commit de7e057

File tree

2 files changed

+4
-151
lines changed

2 files changed

+4
-151
lines changed

‎share/ruby-install/truffleruby/functions.sh‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,13 @@ esac
1616
ruby_dir_name="truffleruby-$ruby_version-$truffleruby_platform-$truffleruby_arch"
1717
ruby_archive="${ruby_archive:-$ruby_dir_name.tar.gz}"
1818
truffleruby_major="${ruby_version%%.*}"
19-
truffleruby_without_major="${ruby_version#*.}"
20-
truffleruby_minor="${truffleruby_without_major%%.*}"
2119

2220
if [[ "$ruby_version" == "23.0.0" ]]; then
2321
log "TruffleRuby 23.0 and later installed by ruby-install use the faster Oracle GraalVM distribution"
2422
log "Oracle GraalVM uses the GFTC license, which is free for development and production use, see https://medium.com/graalvm/161527df3d76"
23+
fi
2524

26-
ruby_mirror="${ruby_mirror:-https://gds.oracle.com/api/20220101/artifacts}"
27-
truffleruby_artifact_id=""
28-
29-
case "$truffleruby_platform-$truffleruby_arch" in
30-
linux-amd64) truffleruby_artifact_id="FD4AB182EA4CEDFDE0531518000AF13E" ;;
31-
linux-aarch64) truffleruby_artifact_id="FD40BA2367C226B6E0531518000AE71A" ;;
32-
macos-amd64) truffleruby_artifact_id="FD4AB182EA51EDFDE0531518000AF13E" ;;
33-
macos-aarch64) truffleruby_artifact_id="FD40BBF6750C366CE0531518000ABEAF" ;;
34-
*) fail "Unsupported platform $truffleruby_platform-$truffleruby_arch" ;;
35-
esac
36-
37-
ruby_url="${ruby_url:-$ruby_mirror/$truffleruby_artifact_id/content}"
38-
elif (( truffleruby_major > 23 || (truffleruby_major == 23 && truffleruby_minor >= 1) )); then # 23.1+
25+
if (( truffleruby_major >= 23 )); then
3926
ruby_mirror="${ruby_mirror:-https://github.com/truffleruby/truffleruby/releases/download}"
4027
ruby_url="${ruby_url:-$ruby_mirror/graal-$ruby_version/$ruby_archive}"
4128
else

‎test/truffleruby-tests/functions_tests.sh‎

Lines changed: 2 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -87,147 +87,13 @@ function test_truffleruby_arch_when_os_arch_is_arm64()
8787
os_arch="$original_os_arch"
8888
}
8989

90-
function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Linux_and_os_arch_is_x86_64()
91-
{
92-
local original_os_arch="$os_arch"
93-
local original_os_platform="$os_platform"
94-
os_arch="x86_64"
95-
os_platform="Linux"
96-
97-
ruby_version="23.0.0"
98-
99-
source "$ruby_install_dir/functions.sh"
100-
source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null
101-
102-
assertEquals "did not correctly set \$truffleruby_artifact_id" \
103-
"FD4AB182EA4CEDFDE0531518000AF13E" \
104-
"$truffleruby_artifact_id"
105-
106-
os_arch="$original_os_arch"
107-
os_platform="$original_os_platform"
108-
}
109-
110-
function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Linux_and_os_arch_is_aarch64()
111-
{
112-
local original_os_arch="$os_arch"
113-
local original_os_platform="$os_platform"
114-
os_arch="aarch64"
115-
os_platform="Linux"
116-
117-
ruby_version="23.0.0"
118-
119-
source "$ruby_install_dir/functions.sh"
120-
source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null
121-
122-
assertEquals "did not correctly set \$truffleruby_artifact_id" \
123-
"FD40BA2367C226B6E0531518000AE71A" \
124-
"$truffleruby_artifact_id"
125-
126-
os_arch="$original_os_arch"
127-
os_platform="$original_os_platform"
128-
}
129-
130-
function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Linux_and_os_arch_is_arm64()
131-
{
132-
local original_os_arch="$os_arch"
133-
local original_os_platform="$os_platform"
134-
os_arch="arm64"
135-
os_platform="Linux"
136-
137-
ruby_version="23.0.0"
138-
139-
source "$ruby_install_dir/functions.sh"
140-
source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null
141-
142-
assertEquals "did not correctly set \$truffleruby_artifact_id" \
143-
"FD40BA2367C226B6E0531518000AE71A" \
144-
"$truffleruby_artifact_id"
145-
146-
os_arch="$original_os_arch"
147-
os_platform="$original_os_platform"
148-
}
149-
150-
function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Darwin_and_os_arch_is_x86_64()
151-
{
152-
local original_os_arch="$os_arch"
153-
local original_os_platform="$os_platform"
154-
os_arch="x86_64"
155-
os_platform="Darwin"
156-
157-
ruby_version="23.0.0"
158-
159-
source "$ruby_install_dir/functions.sh"
160-
source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null
161-
162-
assertEquals "did not correctly set \$truffleruby_artifact_id" \
163-
"FD4AB182EA51EDFDE0531518000AF13E" \
164-
"$truffleruby_artifact_id"
165-
166-
os_arch="$original_os_arch"
167-
os_platform="$original_os_platform"
168-
}
169-
170-
function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Darwin_and_os_arch_is_aarch64()
171-
{
172-
local original_os_arch="$os_arch"
173-
local original_os_platform="$os_platform"
174-
os_arch="aarch64"
175-
os_platform="Darwin"
176-
177-
ruby_version="23.0.0"
178-
179-
source "$ruby_install_dir/functions.sh"
180-
source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null
181-
182-
assertEquals "did not correctly set \$truffleruby_artifact_id" \
183-
"FD40BBF6750C366CE0531518000ABEAF" \
184-
"$truffleruby_artifact_id"
185-
186-
os_arch="$original_os_arch"
187-
os_platform="$original_os_platform"
188-
}
189-
190-
function test_truffleruby_artifact_id_when_ruby_version_is_23_0_0_and_os_platform_is_Darwin_and_os_arch_is_arm64()
191-
{
192-
local original_os_arch="$os_arch"
193-
local original_os_platform="$os_platform"
194-
os_arch="arm64"
195-
os_platform="Darwin"
196-
197-
ruby_version="23.0.0"
198-
199-
source "$ruby_install_dir/functions.sh"
200-
source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null
201-
202-
assertEquals "did not correctly set \$truffleruby_artifact_id" \
203-
"FD40BBF6750C366CE0531518000ABEAF" \
204-
"$truffleruby_artifact_id"
205-
206-
os_arch="$original_os_arch"
207-
os_platform="$original_os_platform"
208-
}
209-
21090
function test_truffleruby_major()
21191
{
21292
assertEquals "did not correctly set \$truffleruby_major" \
21393
"23" \
21494
"$truffleruby_major"
21595
}
21696

217-
function test_truffleruby_without_major()
218-
{
219-
assertEquals "did not correctly set \$truffleruby_without_major" \
220-
"1.0" \
221-
"$truffleruby_without_major"
222-
}
223-
224-
function test_truffleruby_minor()
225-
{
226-
assertEquals "did not correctly set \$truffleruby_minor" \
227-
"1" \
228-
"$truffleruby_minor"
229-
}
230-
23197
function test_ruby_archive_default_value()
23298
{
23399
assertEquals "did not preserve the \$ruby_archive value" \
@@ -290,7 +156,7 @@ function test_ruby_mirror_default_value_when_ruby_version_is_23_0_0()
290156
source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null
291157

292158
assertEquals "did not correctly set \$ruby_mirror" \
293-
"https://gds.oracle.com/api/20220101/artifacts" \
159+
"https://github.com/truffleruby/truffleruby/releases/download" \
294160
"$ruby_mirror"
295161
}
296162

@@ -368,7 +234,7 @@ function test_ruby_url_default_value_when_ruby_version_is_23_0_0()
368234
source "$ruby_install_dir/truffleruby/functions.sh" >/dev/null
369235

370236
assertEquals "did not correctly set \$ruby_url" \
371-
"https://gds.oracle.com/api/20220101/artifacts/$truffleruby_artifact_id/content" \
237+
"https://github.com/truffleruby/truffleruby/releases/download/graal-$ruby_version/$ruby_archive" \
372238
"$ruby_url"
373239
}
374240

0 commit comments

Comments
 (0)