Skip to content

Commit 266389f

Browse files
eregoneregon
authored
Update TruffleRuby URLs and dependencies (#517)
* Reuse truffleruby dependencies for truffleruby-graalvm dependencies since they are the same * Follow repo move from https://github.com/oracle/truffleruby to https://github.com/truffleruby/truffleruby * Use the proper and consistent URLs for TruffleRuby 23.0.0 now that they are available * TruffleRuby 33+ no longer depends on `openssl` and `libyaml` * See https://github.com/truffleruby/truffleruby/blob/master/doc/user/installing-libssl.md and https://github.com/truffleruby/truffleruby/blob/master/doc/user/installing-libyaml.md * `libxml2` is not needed since 20.0 so just drop that: #359 (comment) * Fix order of arguments to `assertEquals` in tests.
1 parent 9253467 commit 266389f

File tree

10 files changed

+177
-495
lines changed

10 files changed

+177
-495
lines changed

‎ChangeLog.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,6 @@
590590
[JRuby]: https://jruby.org/
591591
[MagLev]: https://maglev.github.io/
592592
[MRuby]: https://github.com/mruby/mruby#readme
593-
[truffleruby]: https://github.com/oracle/truffleruby#readme
593+
[truffleruby]: https://github.com/truffleruby/truffleruby#readme
594594

595595
[ruby-versions]: https://github.com/postmodern/ruby-versions#readme

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ of [rbenv]
246246

247247
[Ruby]: https://www.ruby-lang.org/
248248
[JRuby]: https://jruby.org/
249-
[TruffleRuby]: https://github.com/oracle/truffleruby
249+
[TruffleRuby]: https://github.com/truffleruby/truffleruby
250250
[mruby]: https://github.com/mruby/mruby#readme
251251

252252
[Ubuntu]: https://ubuntu.com/

‎share/ruby-install/truffleruby-graalvm/dependencies.sh‎

Lines changed: 2 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,4 @@
11
#!/usr/bin/env bash
22

3-
case "$package_manager" in
4-
apt)
5-
ruby_dependencies=(
6-
make
7-
gcc
8-
zlib1g-dev
9-
libssl-dev
10-
libxml2
11-
libyaml-dev
12-
)
13-
;;
14-
dnf|yum)
15-
ruby_dependencies=(
16-
make
17-
gcc
18-
zlib-devel
19-
openssl-devel
20-
libxml2
21-
libyaml-devel
22-
)
23-
;;
24-
pacman)
25-
ruby_dependencies=(
26-
make
27-
gcc
28-
zlib
29-
openssl
30-
libxml2
31-
libyaml
32-
)
33-
;;
34-
zypper)
35-
ruby_dependencies=(
36-
make
37-
gcc
38-
zlib-devel
39-
libopenssl-devel
40-
libxml2
41-
libyaml-devel
42-
)
43-
;;
44-
pkg)
45-
ruby_dependencies=(
46-
gmake
47-
gcc
48-
openssl
49-
libxml2
50-
libyaml
51-
)
52-
;;
53-
brew)
54-
ruby_dependencies=(
55-
openssl@3
56-
libyaml
57-
)
58-
;;
59-
port)
60-
ruby_dependencies=(
61-
openssl
62-
libyaml
63-
)
64-
;;
65-
xbps)
66-
ruby_dependencies=(
67-
base-devel
68-
openssl-devel
69-
zlib-devel
70-
libxml2
71-
libyaml-devel
72-
)
73-
;;
74-
esac
3+
# Same as truffleruby dependencies
4+
source "${BASH_SOURCE[0]%/*}/../truffleruby/dependencies.sh"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if [[ "$ruby_version" == "23.0.0" ]]; then
2828
elif (( truffleruby_major > 23 || (truffleruby_major == 23 && truffleruby_minor >= 1) )); then # 23.1+
2929
ruby_dir_name="truffleruby-$ruby_version-${graalvm_platform/darwin/macos}-$graalvm_arch"
3030
ruby_archive="${ruby_archive:-truffleruby-jvm-$ruby_version-${graalvm_platform/darwin/macos}-$graalvm_arch.tar.gz}"
31-
ruby_mirror="${ruby_mirror:-https://github.com/oracle/truffleruby/releases/download}"
31+
ruby_mirror="${ruby_mirror:-https://github.com/truffleruby/truffleruby/releases/download}"
3232
ruby_url="${ruby_url:-$ruby_mirror/graal-$ruby_version/$ruby_archive}"
3333
else
3434
ruby_dir_name="graalvm-ce-java11-$ruby_version"
@@ -43,7 +43,7 @@ fi
4343
function install_ruby()
4444
{
4545
if [[ "$install_dir" == '/usr/local' ]]; then
46-
error "Unsupported see https://github.com/oracle/truffleruby/issues/1389"
46+
error "Unsupported see https://github.com/truffleruby/truffleruby/issues/1389"
4747
return 1
4848
fi
4949

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

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,91 @@
11
#!/usr/bin/env bash
22

3+
# See https://github.com/truffleruby/truffleruby/blob/master/README.md#dependencies
4+
5+
truffleruby_major="${ruby_version%%.*}"
6+
37
case "$package_manager" in
48
apt)
59
ruby_dependencies=(
610
make
711
gcc
812
zlib1g-dev
9-
libssl-dev
10-
libxml2
11-
libyaml-dev
13+
ca-certificates
1214
)
1315
;;
14-
dnf|yum)
16+
dnf|yum|zypper)
1517
ruby_dependencies=(
1618
make
1719
gcc
1820
zlib-devel
19-
openssl-devel
20-
libxml2
21-
libyaml-devel
21+
ca-certificates
2222
)
2323
;;
2424
pacman)
2525
ruby_dependencies=(
2626
make
2727
gcc
2828
zlib
29-
openssl
30-
libxml2
31-
libyaml
32-
)
33-
;;
34-
zypper)
35-
ruby_dependencies=(
36-
make
37-
gcc
38-
zlib-devel
39-
libopenssl-devel
40-
libxml2
41-
libyaml-devel
29+
ca-certificates
4230
)
4331
;;
4432
port)
4533
ruby_dependencies=(
46-
openssl
47-
libyaml
34+
curl-ca-bundle
4835
)
4936
;;
5037
brew)
5138
ruby_dependencies=(
52-
openssl@3
53-
libyaml
39+
ca-certificates
5440
)
5541
;;
5642
pkg)
5743
ruby_dependencies=(
5844
gmake
5945
gcc
60-
openssl
61-
libxml2
62-
libyaml
46+
ca-certificates
6347
)
6448
;;
6549
xbps)
6650
ruby_dependencies=(
6751
base-devel
68-
openssl-devel
6952
zlib-devel
70-
libxml2
71-
libyaml-devel
53+
ca-certificates
7254
)
7355
;;
7456
esac
57+
58+
if (( truffleruby_major < 33 )); then
59+
case "$package_manager" in
60+
apt)
61+
ruby_dependencies+=(
62+
libssl-dev
63+
libyaml-dev
64+
)
65+
;;
66+
dnf|yum|xbps)
67+
ruby_dependencies+=(
68+
openssl-devel
69+
libyaml-devel
70+
)
71+
;;
72+
pacman|port|pkg)
73+
ruby_dependencies+=(
74+
openssl
75+
libyaml
76+
)
77+
;;
78+
zypper)
79+
ruby_dependencies+=(
80+
libopenssl-devel
81+
libyaml-devel
82+
)
83+
;;
84+
brew)
85+
ruby_dependencies+=(
86+
openssl@3
87+
libyaml
88+
)
89+
;;
90+
esac
91+
fi

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

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,17 @@ 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+
39-
ruby_mirror="${ruby_mirror:-https://github.com/oracle/truffleruby/releases/download}"
25+
if (( truffleruby_major >= 23 )); then
26+
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
42-
ruby_mirror="${ruby_mirror:-https://github.com/oracle/truffleruby/releases/download}"
29+
ruby_mirror="${ruby_mirror:-https://github.com/truffleruby/truffleruby/releases/download}"
4330
ruby_url="${ruby_url:-$ruby_mirror/vm-$ruby_version/$ruby_archive}"
4431
fi
4532

@@ -49,7 +36,7 @@ fi
4936
function install_ruby()
5037
{
5138
if [[ "$install_dir" == '/usr/local' ]]; then
52-
error "Unsupported see https://github.com/oracle/truffleruby/issues/1389"
39+
error "Unsupported see https://github.com/truffleruby/truffleruby/issues/1389"
5340
return 1
5441
fi
5542

0 commit comments

Comments
 (0)