Skip to content

Commit

Permalink
WIP: ruby & rails upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
noahko96 committed Feb 7, 2024
1 parent 08486b5 commit 51ed71b
Show file tree
Hide file tree
Showing 7 changed files with 224 additions and 208 deletions.
6 changes: 3 additions & 3 deletions .docker-config/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5.1
FROM ruby:3.2.1

RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
Expand All @@ -9,8 +9,8 @@ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
wget xvfb unzip && \
rm -rf /var/lib/apt/lists/*

ENV BUNDLER_VERSION='1.17.3'
RUN gem install bundler:1.17.3
ENV BUNDLER_VERSION='2.4.6'
RUN gem install bundler:2.4.6

RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | \
apt-key add - && \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up ruby 2.5.1
- name: Set up ruby 3.2.1
uses: ruby/setup-ruby@v1

- name: Set up Ruby dependencies
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.1
3.2.1
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ruby 2.5.1
ruby 3.2.1
nodejs 14.17.0
yarn 1.22.19
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'
ruby '3.2.1'

gem 'awesome_print'
gem 'bcrypt'
gem 'bootsnap', '>= 1.1.0', require: false
gem 'bootsnap', '>= 1.4.0', require: false
gem 'devise'
gem 'pg', '>= 0.18', '< 2.0'
gem 'puma', '~> 3.12'
Expand Down Expand Up @@ -43,7 +43,6 @@ group :test do
gem 'capybara', '>= 2.15'
gem 'database_cleaner', '~> 0.9.1'
gem "factory_bot_rails"
gem 'selenium-webdriver'
gem 'selenium-webdriver', '4.8.6'
gem 'simplecov', require: false
gem 'webdrivers', '< 4.1'
end
Loading

0 comments on commit 51ed71b

Please sign in to comment.