ci: upgrade versions

palkan · Feb 12, 2025 · ffd0f0f · ffd0f0f
1 parent 7e52eab
commit ffd0f0f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
@@ -18,31 +18,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0"]
+        ruby: ["3.3"]
         gemfile: [
-          "gemfiles/rails6.gemfile"
+          "gemfiles/rails8.gemfile"
         ]
         rbs: ['false']
         include:
-        - ruby: "3.3"
+        - ruby: "3.4"
           gemfile: "Gemfile"
           rbs: 'true'
         - ruby: "3.2"
           gemfile: "Gemfile"
           rbs: 'false'
-        - ruby: "3.2"
-          gemfile: "gemfiles/rails7.gemfile"
-          rbs: 'false'
-        - ruby: "3.3"
-          gemfile: "gemfiles/railsmaster.gemfile"
-          rbs: 'false'
         - ruby: "3.1"
-          gemfile: "Gemfile"
-          rbs: 'true'
-        - ruby: "3.1"
-          gemfile: "gemfiles/rails7.gemfile"
+          gemfile: "gemfiles/rails6.gemfile"
           rbs: 'false'
-        - ruby: "3.1"
+        - ruby: "3.4"
           gemfile: "gemfiles/railsmaster.gemfile"
           rbs: 'false'
         - ruby: "2.5"

diff --git a/gemfiles/jruby.gemfile b/gemfiles/jruby.gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.0'
+gem 'rails', '~> 7.0'
 
 gemspec path: '..'
diff --git a/gemfiles/rails6.gemfile b/gemfiles/rails6.gemfile
@@ -2,5 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 6.0'
 gem 'zeitwerk'
+# See https://github.com/rails/rails/issues/54263
+gem 'concurrent-ruby', '1.3.4'
 
 gemspec path: '..'
diff --git a/gemfiles/rails8.gemfile b/gemfiles/rails8.gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 8.0'
+
+gemspec path: '..'