Skip to content

Commit ad90eba

Browse files
authored
Update Rails, Ruby, and add ruby debug gem (#516)
* Upgrate to 6.1.7.1 * Fix rubocop I18nLocaleText issue * Apply Rails 6.1.7.1 file changes * Upgrade to Rails 7 and update dependencies * Apply Rails 7 file changes * Fix rubocop issues * Update selenium and webdriver * Fix jbuilder missing template error * Remove ruby version entry to use .ruby_version * Update node to version 18.13.0 LTS * Install debug gem * Update rspec-rails to 6+ * Update dockerfiles to use node 18 * Update rails version in README
1 parent cdff76a commit ad90eba

24 files changed

+438
-214
lines changed

.controlplane/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ruby:3.1.2
33
RUN apt-get update
44

55
# install node and yarn
6-
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash
6+
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash
77
RUN apt-get install -y nodejs
88
RUN npm install -g yarn
99

.github/workflows/test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,12 @@ jobs:
5050
- name: Install Ruby and gems
5151
uses: ruby/setup-ruby@0a29871fe2b0200a17a4497bae54fe5df0d973aa # v1.115.3
5252
with:
53-
ruby: 3.x
5453
bundler-cache: true
5554

56-
- name: Use Node.js 16.x
55+
- name: Use Node.js 18.x
5756
uses: actions/setup-node@v3
5857
with:
59-
node-version: 16.x
58+
node-version: 18.x
6059
- name: Install Node Packages
6160
run: npm install --legacy-peer-deps
6261

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.14.0
1+
v18.13.0

.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Metrics/ClassLength:
6767

6868
Metrics/BlockLength:
6969
Exclude:
70+
- 'config/environments/development.rb'
7071
- 'lib/tasks/linters.rake'
7172
- 'spec/rails_helper.rb'
7273
- 'spec/system/add_new_comment_spec.rb'

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ruby:3.1.2
55

66
RUN apt-get update
77

8-
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash
8+
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash
99
RUN apt-get install -y nodejs
1010
RUN npm install -g yarn
1111

@@ -14,14 +14,14 @@ COPY Gemfile* ./
1414

1515
RUN bundle install
1616

17-
COPY package.json yarn.lock .
17+
COPY package.json yarn.lock ./
1818
RUN yarn install
1919

20-
COPY . .
21-
22-
RUN rails react_on_rails:locale && RAILS_ENV=production rails assets:precompile
20+
COPY . ./
2321

2422
ENV RAILS_ENV=production
2523
ENV NODE_ENV=production
2624

25+
RUN rails react_on_rails:locale && rails assets:precompile
26+
2727
CMD ["rails", "s"]

Gemfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gem "shakapacker", "6.5.5"
1010

1111
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
1212
gem "listen"
13-
gem "rails", "~> 6.1.4"
13+
gem "rails", "~> 7.0"
1414

1515
gem "pg"
1616

@@ -82,6 +82,8 @@ group :development, :test do
8282

8383
################################################################################
8484
# Favorite debugging gems
85+
gem "debug", ">= 1.0.0"
86+
8587
gem "pry"
8688
gem "pry-byebug"
8789
gem "pry-doc"
@@ -102,7 +104,7 @@ group :test do
102104
gem "generator_spec"
103105
gem "launchy"
104106
gem "rails_best_practices"
105-
gem "rspec-rails"
106-
gem "selenium-webdriver"
107-
gem "webdrivers", "3.9.4"
107+
gem "rspec-rails", "~> 6.0.0"
108+
gem "selenium-webdriver", "~> 4"
109+
gem "webdrivers", "~> 5.2"
108110
end

0 commit comments

Comments
 (0)