switch from Appraisal to Bundler::Multilock

instructure · Sep 14, 2023 · 97a60f5 · 97a60f5
1 parent 0acce72
commit 97a60f5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 49 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -1,4 +1,4 @@
-name: Ruby
+name: Continuous Integration
 
 on:
  push:
@@ -8,14 +8,13 @@ on:
 
 jobs:
  test:
-
  runs-on: ubuntu-latest
 
  strategy:
  fail-fast: false
  matrix:
- ruby-version: [3.0, 2.7]
- gemfile: ['gemfiles/rails_7.0.gemfile']
+ ruby-version: [2.7, "3.0", 3.1, 3.2]
+ lockfile: ['Gemfile.rails-7.0.lock']
 
  services:
  postgres:
@@ -38,14 +37,14 @@ jobs:
  ruby-version: ${{ matrix.ruby-version }}
  bundler-cache: true
  env:
- BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+ BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
  - name: Run tests
  run: bin/rspec
  env:
  PGHOST: localhost
  PGUSER: postgres
  PGPASSWORD: postgres
- BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+ BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
  lint:
  runs-on: ubuntu-latest
 

diff --git a/Appraisals b/Appraisals
diff --git a/Gemfile b/Gemfile
@@ -2,4 +2,13 @@
 
 source "https://rubygems.org"
 
+plugin "bundler-multilock", "1.0.4"
+return unless Plugin.installed?("bundler-multilock")
+
+Plugin.send(:load_plugin, "bundler-multilock")
+
 gemspec
+
+lockfile "rails-7.0", default: true do
+ gem "activerecord", "~> 7.0.0"
+end
diff --git a/gemfiles/rails_7.0.gemfile.lock → Gemfile.rails-7.0.lock b/gemfiles/rails_7.0.gemfile.lock → Gemfile.rails-7.0.lock
@@ -1,5 +1,5 @@
 PATH
- remote: ..
+ remote: .
  specs:
  activerecord-pg-extensions (0.5.3)
  activerecord (~> 7.0.0)
@@ -158,4 +158,4 @@ DEPENDENCIES
  rubocop-rspec (~> 2.3)
 
 BUNDLED WITH
- 2.2.17
+ 2.4.19
diff --git a/bin/appraisal b/bin/appraisal
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile