Skip to content

Commit

Permalink
Merge branch 'chore/ruby-upgrade' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
tsubik committed Jan 30, 2025
2 parents a8c77f6 + 7255867 commit 3f3f165
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.3
3.4.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1

# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
ARG RUBY_VERSION=3.2.3
ARG RUBY_VERSION=3.4.1
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base

# Rails app lives here
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

ruby "3.2.3"
ruby "3.4.1"

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
Expand Down
5 changes: 1 addition & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,6 @@ GEM
grpc (1.69.0)
google-protobuf (>= 3.25, < 5.0)
googleapis-common-protos-types (~> 1.0)
grpc (1.69.0-x86_64-linux)
google-protobuf (>= 3.25, < 5.0)
googleapis-common-protos-types (~> 1.0)
grpc-google-iam-v1 (1.8.0)
google-protobuf (>= 3.18, < 5.a)
googleapis-common-protos (~> 1.4)
Expand Down Expand Up @@ -879,7 +876,7 @@ DEPENDENCIES
whenever

RUBY VERSION
ruby 3.2.3p157
ruby 3.4.1p0

BUNDLED WITH
2.5.6
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ bin/dev

### REQUIREMENTS ###

- **Ruby version:** 3.2.3
- **Ruby version:** 3.4.1
- **PostgreSQL 12.1+** [How to install](http://exponential.io/blog/2015/02/21/install-postgresql-on-mac-os-x-via-brew/)

**Just execute the script file in `bin/setup`**
Expand Down

0 comments on commit 3f3f165

Please sign in to comment.