update bundler-multilock, and remove duplicated lockfile (#23)

instructure · Oct 30, 2023 · 29fcd8a · 29fcd8a
1 parent 4fae6ae
commit 29fcd8a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 211 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:
@@ -37,16 +37,19 @@ jobs:
  ruby-version: ${{ matrix.ruby-version }}
  bundler-cache: true
  env:
- BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
+ BUNDLE_NO_PRUNE: true
  - 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
@@ -39,10 +39,6 @@ GEM
  minitest (>= 5.1)
  mutex_m
  tzinfo (~> 2.0)
- appraisal (2.5.0)
- bundler
- rake
- thor (>= 0.14.0)
  ast (2.4.2)
  base64 (0.1.1)
  bigdecimal (3.1.4)
@@ -180,10 +176,11 @@ 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.0.lock b/Gemfile.rails-7.0.lock
@@ -31,10 +31,6 @@ GEM
  i18n (>= 1.6, < 2)
  minitest (>= 5.1)
  tzinfo (~> 2.0)
- appraisal (2.5.0)
- bundler
- rake
- thor (>= 0.14.0)
  ast (2.4.2)
  base64 (0.1.1)
  builder (3.2.4)
@@ -161,7 +157,6 @@ PLATFORMS
 DEPENDENCIES
  activerecord (~> 7.0.0)
  activerecord-pg-extensions!
- appraisal (~> 2.4)
  debug (~> 1.8)
  pg (~> 1.2)
  railties (~> 7.0.0)

diff --git a/Gemfile.rails-7.1.lock b/Gemfile.rails-7.1.lock
diff --git a/activerecord-pg-extensions.gemspec b/activerecord-pg-extensions.gemspec
@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
  spec.add_dependency "activerecord", ">= 7.0", "< 7.2"
  spec.add_dependency "railties", ">= 7.0", "< 7.2"
 
- spec.add_development_dependency "appraisal", "~> 2.4"
  spec.add_development_dependency "debug", "~> 1.8"
  spec.add_development_dependency "pg", "~> 1.2"
  spec.add_development_dependency "rake", "~> 13.0"