Update gemspec to support rails 7.2 and 8.0 (#34)

instructure · Dec 4, 2024 · 0ccaa84 · 0ccaa84
1 parent 7354283
commit 0ccaa84
Show file tree

Hide file tree

Showing 9 changed files with 555 additions and 108 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -13,8 +13,44 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7, "3.0", 3.1, 3.2]
-        lockfile: ['Gemfile.lock', 'Gemfile.rails-7.0.lock']
+        ruby-version:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+        lockfile:
+          - 'rails-7.0'
+          - 'rails-7.1'
+          - 'rails-7.2'
+          - 'Gemfile.lock' # rails-8.0
+
+        include:
+          - ruby-version: '2.7'
+            bundler: '2.4.20'
+          - ruby-version: '3.0'
+            bundler: '2.5.23'
+          - ruby-version: '3.1'
+            bundler: '2.5.23'
+
+        exclude:
+          - ruby-version: '3.3'
+            lockfile: 'rails-7.0'
+
+          - ruby-version: '3.3'
+            lockfile: 'rails-7.1'
+
+          - ruby-version: '2.7'
+            lockfile: 'rails-7.2'
+          - ruby-version: '3.0'
+            lockfile: 'rails-7.2'
+
+          - ruby-version: '2.7'
+            lockfile: 'Gemfile.lock'
+          - ruby-version: '3.0'
+            lockfile: 'Gemfile.lock'
+          - ruby-version: '3.1'
+            lockfile: 'Gemfile.lock'
 
     services:
       postgres:
@@ -29,11 +65,15 @@ jobs:
         ports:
           - 5432:5432
 
+    env:
+      BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
+
     steps:
       - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
+          bundler: ${{ matrix.bundler }}
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
         env:
@@ -44,7 +84,6 @@ jobs:
           PGHOST: localhost
           PGUSER: postgres
           PGPASSWORD: postgres
-          BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
 
   lint:
     runs-on: ubuntu-latest
@@ -56,7 +95,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.3
           bundler-cache: true
       - name: Run RuboCop
         run: bin/rubocop

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.1
+FROM ruby:3.2
 
 RUN apt update && \
 	apt install -y --no-install-recommends \

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-plugin "bundler-multilock", "1.2.0"
+plugin "bundler-multilock", "1.3.4"
 return unless Plugin.installed?("bundler-multilock")
 
 Plugin.send(:load_plugin, "bundler-multilock")
@@ -14,7 +14,17 @@ lockfile "rails-7.0" do
   gem "railties", "~> 7.0.0"
 end
 
-lockfile do
+lockfile "rails-7.1" do
   gem "activerecord", "~> 7.1.0"
   gem "railties", "~> 7.1.0"
 end
+
+lockfile "rails-7.2" do
+  gem "activerecord", "~> 7.2.0"
+  gem "railties", "~> 7.2.0"
+end
+
+lockfile do
+  gem "activerecord", "~> 8.0.0"
+  gem "railties", "~> 8.0.0"
+end