Merge pull request #2709 from TracksApp/ruby31

Test for Ruby 3.1
TracksApp · Jun 6, 2024 · ddd8cb8 · ddd8cb8
2 parents 063c8bd + 1be3c27
commit ddd8cb8
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 46 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["3.0"]
+        ruby: ["3.0", "3.1"]
         db: [sqlite, mysql, postgres]
 
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7
+FROM ruby:3.0
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1

diff --git a/Dockerfile-3.0 b/Dockerfile-3.0
diff --git a/Dockerfile-2.6 → Dockerfile-3.1 b/Dockerfile-2.6 → Dockerfile-3.1
@@ -1,4 +1,4 @@
-FROM ruby:2.6
+FROM ruby:3.1
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1

diff --git a/Gemfile b/Gemfile
@@ -29,7 +29,7 @@ gem 'tracks-chartjs-ror'
 gem 'will_paginate'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-gem 'therubyracer', group: :therubyracer
+gem 'mini_racer', group: :therubyracer
 
 # Use --without <group> argument to skip unnecessary drivers
 gem 'sqlite3', group: :sqlite

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -157,7 +157,7 @@ GEM
       mime-types
       terrapin (~> 0.6.0)
     language_server-protocol (3.17.0.3)
-    libv8 (3.16.14.19)
+    libv8-node (21.7.2.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -177,6 +177,8 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.23.1)
+    mini_racer (0.12.0)
+      libv8-node (~> 21.7.2.0)
     minitest-stub-const (0.6)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
@@ -252,7 +254,6 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (2.8.4)
-    ref (2.0.0)
     regexp_parser (2.8.3)
     reverse_markdown (2.1.1)
       nokogiri
@@ -326,9 +327,6 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
     thor (1.3.0)
     tilt (2.3.0)
     timeout (0.4.1)
@@ -375,6 +373,7 @@ DEPENDENCIES
   jquery-ui-rails (~> 6.0.1)
   kt-paperclip (~> 7.2)
   listen
+  mini_racer
   minitest-stub-const
   mocha
   mysql2 (~> 0.5.5)
@@ -393,7 +392,6 @@ DEPENDENCIES
   solargraph
   spring (~> 4)
   sqlite3
-  therubyracer
   tolk (~> 5.0.1)
   tracks-chartjs-ror
   uglifier (>= 1.3.0)

diff --git a/test-envs/docker-compose-3.0-mysql.yml b/test-envs/docker-compose-3.0-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.0
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

diff --git a/test-envs/docker-compose-3.0-postgres.yml b/test-envs/docker-compose-3.0-postgres.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.0
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

diff --git a/test-envs/docker-compose-3.0-sqlite.yml b/test-envs/docker-compose-3.0-sqlite.yml
@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.0
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

diff --git a/test-envs/docker-compose-2.7-mysql.yml → test-envs/docker-compose-3.1-mysql.yml b/test-envs/docker-compose-2.7-mysql.yml → test-envs/docker-compose-3.1-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.1
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

diff --git a/test-envs/docker-compose-2.7-postgres.yml → test-envs/docker-compose-3.1-postgres.yml b/test-envs/docker-compose-2.7-postgres.yml → test-envs/docker-compose-3.1-postgres.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.1
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV

diff --git a/test-envs/docker-compose-2.7-sqlite.yml → test-envs/docker-compose-3.1-sqlite.yml b/test-envs/docker-compose-2.7-sqlite.yml → test-envs/docker-compose-3.1-sqlite.yml
@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.1
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV