Skip to content

Update Rails, Ruby, and add ruby debug gem #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .controlplane/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ruby:3.1.2
RUN apt-get update

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

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,12 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@0a29871fe2b0200a17a4497bae54fe5df0d973aa # v1.115.3
with:
ruby: 3.x
bundler-cache: true

- name: Use Node.js 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x
- name: Install Node Packages
run: npm install --legacy-peer-deps

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.14.0
v18.13.0
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ Metrics/ClassLength:

Metrics/BlockLength:
Exclude:
- 'config/environments/development.rb'
- 'lib/tasks/linters.rake'
- 'spec/rails_helper.rb'
- 'spec/system/add_new_comment_spec.rb'
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM ruby:3.1.2

RUN apt-get update

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

Expand All @@ -14,14 +14,14 @@ COPY Gemfile* ./

RUN bundle install

COPY package.json yarn.lock .
COPY package.json yarn.lock ./
RUN yarn install

COPY . .

RUN rails react_on_rails:locale && RAILS_ENV=production rails assets:precompile
COPY . ./

ENV RAILS_ENV=production
ENV NODE_ENV=production

RUN rails react_on_rails:locale && rails assets:precompile

CMD ["rails", "s"]
10 changes: 6 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem "shakapacker", "6.5.5"

# Bundle edge Rails instead: gem "rails", github: "rails/rails"
gem "listen"
gem "rails", "~> 6.1.4"
gem "rails", "~> 7.0"

gem "pg"

Expand Down Expand Up @@ -82,6 +82,8 @@ group :development, :test do

################################################################################
# Favorite debugging gems
gem "debug", ">= 1.0.0"

gem "pry"
gem "pry-byebug"
gem "pry-doc"
Expand All @@ -102,7 +104,7 @@ group :test do
gem "generator_spec"
gem "launchy"
gem "rails_best_practices"
gem "rspec-rails"
gem "selenium-webdriver"
gem "webdrivers", "3.9.4"
gem "rspec-rails", "~> 6.0.0"
gem "selenium-webdriver", "~> 4"
gem "webdrivers", "~> 5.2"
end
Loading