Skip to content

Commit

Permalink
[dep] upgrades: ROR, Shakapacker, Node, Ruby, misc gem upgrades (#593)
Browse files Browse the repository at this point in the history
* dep: upgrade node

* dep: upgrade ruby, misc gem upgrades

* dep: upgrade shakapacker to v8, ROR to 14.0.3

* fix: ffi gem failing in ci

* fix: net-pop gem dependency issue

* dep: remove unneeded net-* gems from gemfile

* dep: upgrade to node v22, remove unneeded incompatible deps

* chore: doc update

* fix: update node_version in dockerfile
  • Loading branch information
rameziophobia committed Jul 2, 2024
1 parent acfe281 commit 2689a46
Show file tree
Hide file tree
Showing 11 changed files with 247 additions and 1,116 deletions.
4 changes: 2 additions & 2 deletions .controlplane/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
ARG RUBY_VERSION=3.1.2
ARG RUBY_VERSION=3.3.3
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base

# Install packages needed to build gems and node modules
Expand All @@ -8,7 +8,7 @@ RUN apt-get update -qq && \

# Install JavaScript dependencies
# Make sure NODE_VERSION matches the node version in .nvmrc and package.json
ARG NODE_VERSION=18.13.0
ARG NODE_VERSION=22.3.0
ARG YARN_VERSION=1.22.19
ENV PATH=/usr/local/node/bin:$PATH
RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/js_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18.x]
ruby: [3.1.2]
node: [22.x]
ruby: [3.3.3]

env:
RAILS_ENV: test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18.x]
ruby: [3.1.2]
node: [22.x]
ruby: [3.3.3]

env:
RAILS_ENV: test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rspec_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18.x]
ruby: [3.1.2]
node: [22.x]
ruby: [3.3.3]

services:
postgres:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.13.0
v22.3.0
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.3.3
15 changes: 7 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.1.2"
ruby "3.3.3"

gem "react_on_rails", "14.0.0"
gem "shakapacker", "7.2.1"
gem "react_on_rails", "14.0.3"
gem "shakapacker", "8.0.0"

# Bundle edge Rails instead: gem "rails", github: "rails/rails"
gem "listen"
Expand Down Expand Up @@ -45,11 +45,10 @@ gem "autoprefixer-rails"

gem "awesome_print"

# FIXME: quick fix for rails6, not needed since rails 7.0.1
# https://github.com/rails/rails/pull/44083
gem "net-imap", require: false
gem "net-pop", require: false
gem "net-smtp", require: false
# Needed until Ruby 3.3.4 is released https://github.com/ruby/ruby/pull/11006
# Related issue: https://github.com/ruby/net-pop/issues/26
# TODO: When Ruby 3.3.4 is released, upgrade Ruby and remove this line
gem "net-pop", github: "ruby/net-pop"

gem "redcarpet"

Expand Down
Loading

0 comments on commit 2689a46

Please sign in to comment.