Skip to content

Commit

Permalink
Merge pull request #405 from adriangohjw/upgrade-ruby-rails-gems
Browse files Browse the repository at this point in the history
update to ruby 3.2.1 + rails 7 + gem dependencies
  • Loading branch information
adriangohjw authored May 27, 2024
2 parents d452b5f + b87f9e7 commit 9ebe929
Show file tree
Hide file tree
Showing 10 changed files with 216 additions and 177 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.1
ruby-version: 3.3.1
- name: Setup environment and run tests
env:
DATABASE_URL: postgres://postgres:postgres@localhost:5432/test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_to_fly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.1
ruby-version: 3.3.1
- name: Setup environment and run tests
env:
DATABASE_URL: postgres://postgres:postgres@localhost:5432/test
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
3.3.1
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# syntax = docker/dockerfile:experimental
ARG RUBY_VERSION=2.7.1
ARG RUBY_VERSION=3.3.1
ARG VARIANT=jemalloc-slim
FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-${VARIANT} as base

ARG NODE_VERSION=16
ARG BUNDLER_VERSION=2.3.9
ARG BUNDLER_VERSION=2.5.10

ARG RAILS_ENV=production
ENV RAILS_ENV=${RAILS_ENV}
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'

ruby '2.7.1'
ruby '3.3.1'

gem 'puma'
gem 'rails', '~> 6.1.7'
gem 'pg', '~> 1' # Fix version until Rails supports 1.0.0
gem 'rails', '~> 7.1.3'
gem 'pg'

gem 'slim-rails'
gem 'sass-rails'
Expand All @@ -22,7 +22,7 @@ gem 'httparty'
gem 'rufus-scheduler'
gem 'nokogiri', '>= 1.8.1'
gem 'rails-html-sanitizer', '>= 1.0.4'
gem 'telegram-bot', '~> 0.15.0'
gem 'telegram-bot'
gem 'rqrcode', '~> 1.0'
gem "delayed_job_active_record", "~> 4.1"

Expand Down
Loading

0 comments on commit 9ebe929

Please sign in to comment.