Skip to content

Commit

Permalink
Update ruby to 3.3.1; also rails to 7.1.3.4 (#4450)
Browse files Browse the repository at this point in the history
* Update ruby to 3.3.2; also rails to 7.1.3.4

* Lint fix

* Update audit ruby versions

* Further Gemfile.lock updates

* Update ruby version in GH actions
  • Loading branch information
tsmartt authored Jun 6, 2024
1 parent 84b27fd commit e8a706a
Show file tree
Hide file tree
Showing 13 changed files with 169 additions and 165 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.0
ruby-version: 3.3.1
- name: Bundle install
run: |
bundle config path vendor/bundle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.0
ruby-version: 3.3.1
- name: Bundle install
run: |
bundle config path vendor/bundle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.0
ruby-version: 3.3.1
- name: Setup firefox
uses: browser-actions/setup-firefox@0f622aed2a492183149a5a5c347205a593802e10 # v1.3.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.0
3.3.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Make sure it matches the Ruby version in .ruby-version and Gemfile
ARG RUBY_VERSION=3.3.0
ARG RUBY_VERSION=3.3.1
FROM ruby:$RUBY_VERSION

# Install JavaScript dependencies and libvips for Active Storage
Expand Down
12 changes: 1 addition & 11 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
FROM debian:bullseye-slim as base


FROM ruby:3.3.1-slim

RUN apt-get update -qq && apt-get install -y build-essential software-properties-common
RUN apt-get update -qq
Expand All @@ -15,14 +13,6 @@ RUN apt-get install -y nodejs \
automake \
libsodium23

RUN apt update && apt install -y build-essential wget autoconf
RUN wget https://github.com/postmodern/ruby-install/releases/download/v0.9.3/ruby-install-0.9.3.tar.gz \
&& tar -xzvf ruby-install-0.9.3.tar.gz \
&& cd ruby-install-0.9.3/ \
&& make install
RUN ruby-install -p https://github.com/ruby/ruby/pull/9371.diff ruby 3.3.0
ENV PATH="/opt/rubies/ruby-3.3.0/bin:${PATH}"

RUN gem install bundler

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.70.0
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# frozen_string_literal: true

ruby "~> 3.3.0"
ruby "~> 3.3.1"

source "https://rubygems.org"

rails_version = "7.1.3.3"
rails_version = "7.1.3.4"
gem "rails", rails_version
gem "rails-html-sanitizer", "1.6.0"
gem "railties", rails_version
Expand Down
Loading

0 comments on commit e8a706a

Please sign in to comment.