update bundler-multilock, and remove duplicated lockfile

instructure · Oct 10, 2023 · cba27b4 · cba27b4
1 parent 4fae6ae
commit cba27b4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 201 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version: [2.7, "3.0", 3.1, 3.2]
-        lockfile: ['Gemfile.rails-7.0.lock', 'Gemfile.rails-7.1.lock']
+        lockfile: ['Gemfile.lock', 'Gemfile.rails-7.0.lock']
 
     services:
       postgres:
@@ -36,17 +36,18 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
-        env:
-          BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
       - name: Run tests
         run: bin/rspec
         env:
           PGHOST: localhost
           PGUSER: postgres
           PGPASSWORD: postgres
           BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
+
   lint:
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_LOCKFILE: "Gemfile.lock"
 
     steps:
       - uses: actions/checkout@v3

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-plugin "bundler-multilock", "1.1.2"
+plugin "bundler-multilock", "1.2.0"
 return unless Plugin.installed?("bundler-multilock")
 
 Plugin.send(:load_plugin, "bundler-multilock")
@@ -14,7 +14,7 @@ lockfile "rails-7.0" do
   gem "railties", "~> 7.0.0"
 end
 
-lockfile "rails-7.1" do
+lockfile do
   gem "activerecord", "~> 7.1.0"
   gem "railties", "~> 7.1.0"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -180,10 +180,12 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  activerecord (~> 7.1.0)
   activerecord-pg-extensions!
   appraisal (~> 2.4)
   debug (~> 1.8)
   pg (~> 1.2)
+  railties (~> 7.1.0)
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop-inst (~> 1)

diff --git a/Gemfile.rails-7.1.lock b/Gemfile.rails-7.1.lock