Skip to content

Commit 9ebe929

Browse files
authored
Merge pull request #405 from adriangohjw/upgrade-ruby-rails-gems
update to ruby 3.2.1 + rails 7 + gem dependencies
2 parents d452b5f + b87f9e7 commit 9ebe929

File tree

10 files changed

+216
-177
lines changed

10 files changed

+216
-177
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Ruby
2525
uses: ruby/setup-ruby@v1
2626
with:
27-
ruby-version: 2.7.1
27+
ruby-version: 3.3.1
2828
- name: Setup environment and run tests
2929
env:
3030
DATABASE_URL: postgres://postgres:postgres@localhost:5432/test

.github/workflows/deploy_to_fly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Ruby
2626
uses: ruby/setup-ruby@v1
2727
with:
28-
ruby-version: 2.7.1
28+
ruby-version: 3.3.1
2929
- name: Setup environment and run tests
3030
env:
3131
DATABASE_URL: postgres://postgres:postgres@localhost:5432/test

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.1
1+
3.3.1

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# syntax = docker/dockerfile:experimental
2-
ARG RUBY_VERSION=2.7.1
2+
ARG RUBY_VERSION=3.3.1
33
ARG VARIANT=jemalloc-slim
44
FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-${VARIANT} as base
55

66
ARG NODE_VERSION=16
7-
ARG BUNDLER_VERSION=2.3.9
7+
ARG BUNDLER_VERSION=2.5.10
88

99
ARG RAILS_ENV=production
1010
ENV RAILS_ENV=${RAILS_ENV}

Gemfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
source 'https://rubygems.org'
22

3-
ruby '2.7.1'
3+
ruby '3.3.1'
44

55
gem 'puma'
6-
gem 'rails', '~> 6.1.7'
7-
gem 'pg', '~> 1' # Fix version until Rails supports 1.0.0
6+
gem 'rails', '~> 7.1.3'
7+
gem 'pg'
88

99
gem 'slim-rails'
1010
gem 'sass-rails'
@@ -22,7 +22,7 @@ gem 'httparty'
2222
gem 'rufus-scheduler'
2323
gem 'nokogiri', '>= 1.8.1'
2424
gem 'rails-html-sanitizer', '>= 1.0.4'
25-
gem 'telegram-bot', '~> 0.15.0'
25+
gem 'telegram-bot'
2626
gem 'rqrcode', '~> 1.0'
2727
gem "delayed_job_active_record", "~> 4.1"
2828

0 commit comments

Comments
 (0)