Skip to content

Commit 8fee300

Browse files
committed
Update ruby to 2.7.
1 parent 693d341 commit 8fee300

File tree

2 files changed

+2
-29
lines changed

2 files changed

+2
-29
lines changed

tools/metacall-environment.sh

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,26 +105,13 @@ sub_ruby(){
105105
echo "configure ruby"
106106
cd $ROOT_DIR
107107

108-
# TODO: Remove this when using ruby2.5 (not available yet because it fails on loading a script with a malloc error)
109-
$SUDO_CMD mv /etc/apt/sources.list /etc/apt/sources.list.backup
110-
$SUDO_CMD sh -c "echo \"deb http://ftp.debian.org/debian/ stretch main\" > /etc/apt/sources.list"
111-
$SUDO_CMD sh -c "echo \"deb-src http://ftp.debian.org/debian/ stretch main\" >> /etc/apt/sources.list"
112-
$SUDO_CMD sh -c "echo \"deb http://security.debian.org/debian-security stretch/updates main\" >> /etc/apt/sources.list"
113-
$SUDO_CMD sh -c "echo \"deb-src http://security.debian.org/debian-security stretch/updates main\" >> /etc/apt/sources.list"
114-
$SUDO_CMD sh -c "echo \"deb http://ftp.debian.org/debian/ stretch-updates main\" >> /etc/apt/sources.list"
115-
$SUDO_CMD sh -c "echo \"deb-src http://ftp.debian.org/debian/ stretch-updates main\" >> /etc/apt/sources.list"
116-
117108
$SUDO_CMD apt-get update
118-
#$SUDO_CMD apt-get $APT_CACHE_CMD -y --no-install-recommends --allow-remove-essential install git-core curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev software-properties-common libffi-dev ruby2.5 libruby2.5 ruby2.5-dev
119-
$SUDO_CMD apt-get $APT_CACHE_CMD -y --no-install-recommends --allow-remove-essential --allow-downgrades install libgmp10=2:6.1.2+dfsg-1 libgmp-dev libncurses5 libtinfo5 ruby2.3 libruby2.3 ruby2.3-dev
109+
$SUDO_CMD apt-get $APT_CACHE_CMD -y --no-install-recommends install ruby2.7 ruby2.7-dev
120110

121111
# TODO: Review conflict with NodeJS (currently rails test is disabled)
122112
#wget https://deb.nodesource.com/setup_4.x | $SUDO_CMD bash -
123113
#$SUDO_CMD apt-get -y --no-install-recommends install nodejs
124114
#$SUDO_CMD gem install rails
125-
126-
# TODO: Remove this when using ruby2.5 (not available yet because it fails on loading a script with a malloc error)
127-
$SUDO_CMD mv /etc/apt/sources.list.backup /etc/apt/sources.list
128115
}
129116

130117
# RapidJSON

tools/metacall-runtime.sh

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,8 @@ sub_ruby(){
6464
echo "configure ruby"
6565
cd $ROOT_DIR
6666

67-
# TODO: Remove this when using ruby2.5 (not available yet because it fails on loading a script with a malloc error)
68-
$SUDO_CMD mv /etc/apt/sources.list /etc/apt/sources.list.backup
69-
$SUDO_CMD sh -c "echo \"deb http://ftp.debian.org/debian/ stretch main\" > /etc/apt/sources.list"
70-
$SUDO_CMD sh -c "echo \"deb-src http://ftp.debian.org/debian/ stretch main\" >> /etc/apt/sources.list"
71-
$SUDO_CMD sh -c "echo \"deb http://security.debian.org/debian-security stretch/updates main\" >> /etc/apt/sources.list"
72-
$SUDO_CMD sh -c "echo \"deb-src http://security.debian.org/debian-security stretch/updates main\" >> /etc/apt/sources.list"
73-
$SUDO_CMD sh -c "echo \"deb http://ftp.debian.org/debian/ stretch-updates main\" >> /etc/apt/sources.list"
74-
$SUDO_CMD sh -c "echo \"deb-src http://ftp.debian.org/debian/ stretch-updates main\" >> /etc/apt/sources.list"
75-
7667
$SUDO_CMD apt-get update
77-
# sub_apt_install_hold ruby2.5 libruby2.5
78-
$SUDO_CMD apt-get -y install --no-install-recommends --allow-remove-essential --allow-downgrades libssl1.1 libffi6 zlib1g libyaml-0-2 libgmp10=2:6.1.2+dfsg-1 libreadline7 libxml2 libncurses5 libtinfo5 ruby2.3 libruby2.3
79-
$SUDO_CMD apt-mark hold libssl1.1 libffi6 zlib1g libyaml-0-2 libgmp10 libreadline7 libxml2 libncurses5 libtinfo5 ruby2.3 libruby2.3
80-
81-
# TODO: Remove this when using ruby2.5 (not available yet because it fails on loading a script with a malloc error)
82-
$SUDO_CMD mv /etc/apt/sources.list.backup /etc/apt/sources.list
68+
sub_apt_install_hold ruby2.7 libruby2.7
8369
}
8470

8571
# NetCore

0 commit comments

Comments
 (0)