Merge pull request #504 from ruby-i18n/bump-ruby-rails

Bump Ruby + Rails versions in Github Actions configuration
ruby-i18n · Jan 7, 2020 · f4e48a6 · f4e48a6
2 parents 3a29627 + 8ab77db
commit f4e48a6
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 36 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -5,26 +5,47 @@ on: [push]
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
-        ruby_version: [2.6.x, 2.5.x, 2.4.x, 2.3.x, jruby]
-        gemfile: [Gemfile, gemfiles/Gemfile.rails-5.0.x, gemfiles/Gemfile.rails-5.1.x, gemfiles/Gemfile.rails-5.2.x, gemfiles/Gemfile.rails-master]
+        ruby_version: [
+          2.7.0,
+          2.6.5,
+          2.5.7,
+          2.4.9,
+          2.3.8,
+          jruby
+        ]
+        gemfile: [
+          Gemfile,
+          gemfiles/Gemfile.rails-5.0.x,
+          gemfiles/Gemfile.rails-5.1.x,
+          gemfiles/Gemfile.rails-5.2.x,
+          gemfiles/Gemfile.rails-6.0.x,
+          gemfiles/Gemfile.rails-master
+        ]
         exclude:
           # Ruby 2.4.x is not supported by Rails master
-          - ruby_version: 2.4.x
+          - ruby_version: 2.4.9
             gemfile: gemfiles/Gemfile.rails-master
+          # Ruby 2.4.x is not supported by Rails 6.0.x
+          - ruby_version: 2.4.9
+            gemfile: gemfiles/Gemfile.rails-6.0.x
           # Ruby 2.3.x is not supported by Rails master
-          - ruby_version: 2.3.x
+          - ruby_version: 2.3.8
             gemfile: gemfiles/Gemfile.rails-master
+          # Ruby 2.3.x is not supported by Rails 6.0.x
+          - ruby_version: 2.3.8
+            gemfile: gemfiles/Gemfile.rails-6.0.x
           # JRuby is not supported by Rails master
           - ruby_version: jruby
             gemfile: gemfiles/Gemfile.rails-master
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: eregon/use-ruby-action@master
       with:
         ruby-version: ${{ matrix.ruby_version }}
     - name: Build and test with Rake

diff --git a/.travis.yml b/.travis.yml
diff --git a/gemfiles/Gemfile.rails-6.0.x b/gemfiles/Gemfile.rails-6.0.x
@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'activesupport', '~> 6.0.0'
+gem 'mocha', '~> 1.7.0'
+gem 'test_declarative', '0.0.6'
+gem 'rake'
+gem 'minitest', '~> 5.1'
+
+platforms :mri do
+  gem 'oj'
+end