Merge branch 'rails-8' of https://github.com/benedikt/flipper into be…

…nedikt-rails-8
flippercloud · Nov 18, 2024 · ebdc458 · ebdc458
2 parents 8080cfd + 3afdefd
commit ebdc458
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,32 +31,32 @@ jobs:
         ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
         rails: ["5.2", "6.0.0", "6.1.0", "7.0.0", "7.1.0", "7.2.0", "8.0.0"]
         exclude:
-          - ruby: "2.6"
-            rails: "8.0.0"
-          - ruby: "2.7"
-            rails: "8.0.0"
-          - ruby: "3.0"
-            rails: "8.0.0"
-          - ruby: "3.1"
-            rails: "8.0.0"
-          - ruby: "2.6"
-            rails: "7.2.0"
-          - ruby: "2.7"
-            rails: "7.2.0"
-          - ruby: "3.0"
-            rails: "7.2.0"
           - ruby: "2.6"
             rails: "7.1.0"
           - ruby: "2.6"
             rails: "7.0.0"
+          - ruby: "2.6"
+            rails: "7.2.0"
+          - ruby: "2.6"
+            rails: "8.0.0"
           - ruby: "2.7"
             rails: "7.1.0"
+          - ruby: "2.7"
+            rails: "7.2.0"
+          - ruby: "2.7"
+            rails: "8.0.0"
           - ruby: "3.0"
             rails: "5.2"
+          - ruby: "3.0"
+            rails: "7.2.0"
+          - ruby: "3.0"
+            rails: "8.0.0"
           - ruby: "3.1"
             rails: "5.2"
           - ruby: "3.1"
             rails: "6.0.0"
+          - ruby: "3.1"
+            rails: "8.0.0"
           - ruby: "3.2"
             rails: "5.2"
           - ruby: "3.2"
@@ -70,6 +70,7 @@ jobs:
           - ruby: "3.3"
             rails: "6.1.0"
     env:
+      SQLITE3_VERSION: ${{ matrix.rails == '8.0.0' && '2.1.0' || '1.4.1' }}
       REDIS_URL: redis://localhost:6379/0
       CI: true
       RAILS_VERSION: ${{ matrix.rails }}

diff --git a/Gemfile b/Gemfile
@@ -6,26 +6,14 @@ Dir['flipper-*.gemspec'].each do |gemspec|
   gemspec(name: "flipper-#{plugin}", development_group: plugin)
 end
 
-rails_version = ENV['RAILS_VERSION'] || '8.0'
-sqlite3_version = ENV['SQLITE3_VERSION'] || case rails_version
-when /8\.\d+/
-  '2.1.0'
-when /7\.\d+/
-  '1.4.1'
-when /6\.\d+/
-  '1.4.1'
-when /5\.\d+/
-  '1.3.11'
-end
-
 gem 'debug'
 gem 'rake'
 gem 'statsd-ruby', '~> 1.2.1'
 gem 'rspec', '~> 3.0'
 gem 'rack-test'
-gem 'rackup'
-gem 'sqlite3', "~> #{sqlite3_version}"
-gem 'rails', "~> #{rails_version}"
+gem 'rackup', '= 1.0.0'
+gem 'sqlite3', "~> #{ENV['SQLITE3_VERSION'] || '1.4.1'}"
+gem 'rails', "~> #{ENV['RAILS_VERSION'] || '7.1'}"
 gem 'minitest', '~> 5.18'
 gem 'minitest-documentation'
 gem 'webmock'
@@ -38,9 +26,8 @@ gem 'stackprof-webnav'
 gem 'flamegraph'
 gem 'mysql2'
 gem 'pg'
-gem 'cuprite', '0.15.0'
+gem 'cuprite'
 gem 'puma'
-gem 'ferrum', '0.14.0' # until we can upgrae to whatever is after 0.15.0 as that doesn't support 2.7
 
 group(:guard) do
   gem 'guard'