Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Ruby 3.3.5 #415

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## 3.0.8 (release date: TBD)
* Upgraded to Ruby 3.3.5

## 3.0.7 (release date: 2024-07-30)
* Upgraded to Ruby 3.3.4
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ Basics (learn more at [baseimage-docker](http://phusion.github.io/baseimage-dock

Language support:

* Ruby 3.1.6, 3.2.5, 3.3.4 and JRuby 9.3.15.0 and 9.4.8.0.
* Ruby 3.1.6, 3.2.5, 3.3.5 and JRuby 9.3.15.0 and 9.4.8.0.
* RVM is used to manage Ruby versions. [Why RVM?](#why_rvm)
* 3.3.4 is configured as the default.
* 3.3.5 is configured as the default.
* JRuby is installed from source, but we register an APT entry for it.
* JRuby uses OpenJDK 17.
* Python 2.7 or 3.10, or any version provided by the Deadsnakes PPA (currently 3.7, 3.8, 3.9, 3.11, and 3.12; see https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa).
Expand Down Expand Up @@ -451,8 +451,8 @@ The default Ruby (what the `/usr/bin/ruby` command executes) is the latest Ruby
RUN bash -lc 'rvm --default use ruby-3.1.6'
# Ruby 3.2.5
RUN bash -lc 'rvm --default use ruby-3.2.5'
# Ruby 3.3.4
RUN bash -lc 'rvm --default use ruby-3.3.4'
# Ruby 3.3.5
RUN bash -lc 'rvm --default use ruby-3.3.5'
# JRuby 9.3.15.0
RUN bash -lc 'rvm --default use jruby-9.3.15.0'
# JRuby 9.4.8.0
Expand All @@ -471,16 +471,16 @@ $ rvm-exec 3.1.6 ruby -v
Using /usr/local/rvm/gems/ruby-3.1.6
ruby 3.1.6p260 (2024-05-29 revision a777087be6) [x86_64-linux]

$ rvm-exec 3.3.4 ruby -v
Using /usr/local/rvm/gems/ruby-3.3.4
ruby 3.3.4 (2024-07-09 revision be1089c8ec) [x86_64-linux]
$ rvm-exec 3.3.5 ruby -v
Using /usr/local/rvm/gems/ruby-3.3.5
ruby 3.3.5 (2024-09-03 revision ef084cc8f4) [x86_64-linux]
```

More examples, but with Bundler instead:

```bash
# This runs 'bundle install' using Ruby 3.3.4
rvm-exec 3.3.4 bundle install
# This runs 'bundle install' using Ruby 3.3.5
rvm-exec 3.3.5 bundle install
```

<a name="default_ruby_wrapper_scripts"></a>
Expand Down
2 changes: 1 addition & 1 deletion image/nginx-passenger.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ header "Installing Phusion Passenger..."
## Install it through RVM, not APT, so that the -customizable variant cannot end up
## having Ruby installed from both APT and RVM.
if [[ ! -e /usr/bin/ruby ]]; then
RVM_ID="ruby-3.3.4"
RVM_ID="ruby-3.3.5"

run mkdir -p "/build_cache/${ARCH}"
if [[ -e "/build_cache/${ARCH}/${RVM_ID}.tar.bz2" ]]; then
Expand Down
File renamed without changes.