mirror of
https://github.com/TracksApp/tracks.git
synced 2025-09-21 21:40:48 +02:00
Run tests for Ruby 3.1 and change from racer to mini_racer for Ruby 3.1 support
This commit is contained in:
parent
063c8bd786
commit
1be3c27165
12 changed files with 14 additions and 46 deletions
2
.github/workflows/continuous-integration.yml
vendored
2
.github/workflows/continuous-integration.yml
vendored
|
@ -6,7 +6,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
ruby: ["3.0"]
|
ruby: ["3.0", "3.1"]
|
||||||
db: [sqlite, mysql, postgres]
|
db: [sqlite, mysql, postgres]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ruby:2.7
|
FROM ruby:3.0
|
||||||
|
|
||||||
# throw errors if Gemfile has been modified since Gemfile.lock
|
# throw errors if Gemfile has been modified since Gemfile.lock
|
||||||
RUN bundle config --global frozen 1
|
RUN bundle config --global frozen 1
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
FROM ruby:3.0
|
|
||||||
|
|
||||||
# throw errors if Gemfile has been modified since Gemfile.lock
|
|
||||||
RUN bundle config --global frozen 1
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
RUN touch /etc/app-env
|
|
||||||
|
|
||||||
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
|
||||||
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
|
||||||
RUN apt-get update && apt-get install -y yarn
|
|
||||||
|
|
||||||
COPY Gemfile* /app/
|
|
||||||
RUN gem install bundler
|
|
||||||
RUN bundle install --jobs 4
|
|
||||||
|
|
||||||
RUN mkdir /app/log
|
|
||||||
|
|
||||||
COPY . /app/
|
|
||||||
COPY config/database.docker.yml /app/config/database.yml
|
|
||||||
COPY config/site.docker.yml /app/config/site.yml
|
|
||||||
|
|
||||||
RUN RAILS_ENV=production bundle exec rake assets:precompile
|
|
||||||
|
|
||||||
ENTRYPOINT ["/app/docker-entrypoint.sh"]
|
|
||||||
|
|
||||||
EXPOSE 3000
|
|
||||||
|
|
||||||
CMD ["rails", "server", "-b", "0.0.0.0"]
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ruby:2.6
|
FROM ruby:3.1
|
||||||
|
|
||||||
# throw errors if Gemfile has been modified since Gemfile.lock
|
# throw errors if Gemfile has been modified since Gemfile.lock
|
||||||
RUN bundle config --global frozen 1
|
RUN bundle config --global frozen 1
|
2
Gemfile
2
Gemfile
|
@ -29,7 +29,7 @@ gem 'tracks-chartjs-ror'
|
||||||
gem 'will_paginate'
|
gem 'will_paginate'
|
||||||
|
|
||||||
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
# 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
|
# Use --without <group> argument to skip unnecessary drivers
|
||||||
gem 'sqlite3', group: :sqlite
|
gem 'sqlite3', group: :sqlite
|
||||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -157,7 +157,7 @@ GEM
|
||||||
mime-types
|
mime-types
|
||||||
terrapin (~> 0.6.0)
|
terrapin (~> 0.6.0)
|
||||||
language_server-protocol (3.17.0.3)
|
language_server-protocol (3.17.0.3)
|
||||||
libv8 (3.16.14.19)
|
libv8-node (21.7.2.0)
|
||||||
listen (3.8.0)
|
listen (3.8.0)
|
||||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||||
rb-inotify (~> 0.9, >= 0.9.10)
|
rb-inotify (~> 0.9, >= 0.9.10)
|
||||||
|
@ -177,6 +177,8 @@ GEM
|
||||||
mini_mime (1.1.5)
|
mini_mime (1.1.5)
|
||||||
mini_portile2 (2.8.5)
|
mini_portile2 (2.8.5)
|
||||||
minitest (5.23.1)
|
minitest (5.23.1)
|
||||||
|
mini_racer (0.12.0)
|
||||||
|
libv8-node (~> 21.7.2.0)
|
||||||
minitest-stub-const (0.6)
|
minitest-stub-const (0.6)
|
||||||
mocha (2.1.0)
|
mocha (2.1.0)
|
||||||
ruby2_keywords (>= 0.0.5)
|
ruby2_keywords (>= 0.0.5)
|
||||||
|
@ -252,7 +254,6 @@ GEM
|
||||||
rb-inotify (0.10.1)
|
rb-inotify (0.10.1)
|
||||||
ffi (~> 1.0)
|
ffi (~> 1.0)
|
||||||
rbs (2.8.4)
|
rbs (2.8.4)
|
||||||
ref (2.0.0)
|
|
||||||
regexp_parser (2.8.3)
|
regexp_parser (2.8.3)
|
||||||
reverse_markdown (2.1.1)
|
reverse_markdown (2.1.1)
|
||||||
nokogiri
|
nokogiri
|
||||||
|
@ -326,9 +327,6 @@ GEM
|
||||||
unicode-display_width (>= 1.1.1, < 3)
|
unicode-display_width (>= 1.1.1, < 3)
|
||||||
terrapin (0.6.0)
|
terrapin (0.6.0)
|
||||||
climate_control (>= 0.0.3, < 1.0)
|
climate_control (>= 0.0.3, < 1.0)
|
||||||
therubyracer (0.12.3)
|
|
||||||
libv8 (~> 3.16.14.15)
|
|
||||||
ref
|
|
||||||
thor (1.3.0)
|
thor (1.3.0)
|
||||||
tilt (2.3.0)
|
tilt (2.3.0)
|
||||||
timeout (0.4.1)
|
timeout (0.4.1)
|
||||||
|
@ -375,6 +373,7 @@ DEPENDENCIES
|
||||||
jquery-ui-rails (~> 6.0.1)
|
jquery-ui-rails (~> 6.0.1)
|
||||||
kt-paperclip (~> 7.2)
|
kt-paperclip (~> 7.2)
|
||||||
listen
|
listen
|
||||||
|
mini_racer
|
||||||
minitest-stub-const
|
minitest-stub-const
|
||||||
mocha
|
mocha
|
||||||
mysql2 (~> 0.5.5)
|
mysql2 (~> 0.5.5)
|
||||||
|
@ -393,7 +392,6 @@ DEPENDENCIES
|
||||||
solargraph
|
solargraph
|
||||||
spring (~> 4)
|
spring (~> 4)
|
||||||
sqlite3
|
sqlite3
|
||||||
therubyracer
|
|
||||||
tolk (~> 5.0.1)
|
tolk (~> 5.0.1)
|
||||||
tracks-chartjs-ror
|
tracks-chartjs-ror
|
||||||
uglifier (>= 1.3.0)
|
uglifier (>= 1.3.0)
|
||||||
|
|
|
@ -10,7 +10,7 @@ services:
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: Dockerfile-3.0
|
dockerfile: Dockerfile
|
||||||
environment:
|
environment:
|
||||||
# These are set in script/ci-build, so we need to pass-thru them.
|
# These are set in script/ci-build, so we need to pass-thru them.
|
||||||
RAILS_ENV: $RAILS_ENV
|
RAILS_ENV: $RAILS_ENV
|
||||||
|
|
|
@ -10,7 +10,7 @@ services:
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: Dockerfile-3.0
|
dockerfile: Dockerfile
|
||||||
environment:
|
environment:
|
||||||
# These are set in script/ci-build, so we need to pass-thru them.
|
# These are set in script/ci-build, so we need to pass-thru them.
|
||||||
RAILS_ENV: $RAILS_ENV
|
RAILS_ENV: $RAILS_ENV
|
||||||
|
|
|
@ -3,7 +3,7 @@ services:
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: Dockerfile-3.0
|
dockerfile: Dockerfile
|
||||||
environment:
|
environment:
|
||||||
# These are set in script/ci-build, so we need to pass-thru them.
|
# These are set in script/ci-build, so we need to pass-thru them.
|
||||||
RAILS_ENV: $RAILS_ENV
|
RAILS_ENV: $RAILS_ENV
|
||||||
|
|
|
@ -10,7 +10,7 @@ services:
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile-3.1
|
||||||
environment:
|
environment:
|
||||||
# These are set in script/ci-build, so we need to pass-thru them.
|
# These are set in script/ci-build, so we need to pass-thru them.
|
||||||
RAILS_ENV: $RAILS_ENV
|
RAILS_ENV: $RAILS_ENV
|
|
@ -10,7 +10,7 @@ services:
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile-3.1
|
||||||
environment:
|
environment:
|
||||||
# These are set in script/ci-build, so we need to pass-thru them.
|
# These are set in script/ci-build, so we need to pass-thru them.
|
||||||
RAILS_ENV: $RAILS_ENV
|
RAILS_ENV: $RAILS_ENV
|
|
@ -3,7 +3,7 @@ services:
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile-3.1
|
||||||
environment:
|
environment:
|
||||||
# These are set in script/ci-build, so we need to pass-thru them.
|
# These are set in script/ci-build, so we need to pass-thru them.
|
||||||
RAILS_ENV: $RAILS_ENV
|
RAILS_ENV: $RAILS_ENV
|
Loading…
Add table
Add a link
Reference in a new issue