Skip to content
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.

Sign up for GitHub

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

Test for Ruby 3.1 #2709

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Test for Ruby 3.1 #2709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: ["3.0"]
ruby: ["3.0", "3.1"]
db: [sqlite, mysql, postgres]

steps:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
30 changes: 0 additions & 30 deletions Dockerfile-3.0
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile-2.6 → Dockerfile-3.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -393,7 +392,6 @@ DEPENDENCIES
solargraph
spring (~> 4)
sqlite3
therubyracer
tolk (~> 5.0.1)
tracks-chartjs-ror
uglifier (>= 1.3.0)
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-3.0-mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-3.0-postgres.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-3.0-sqlite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-2.7-mysql.yml → test-envs/docker-compose-3.1-mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-2.7-postgres.yml → test-envs/docker-compose-3.1-postgres.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-2.7-sqlite.yml → test-envs/docker-compose-3.1-sqlite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down