Pass bundle path through to Appraisal

bensheldon · Mar 7, 2020 · 60afc43 · 60afc43
1 parent 157f3aa
commit 60afc43
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 30 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,32 +10,31 @@ jobs:
       BUNDLE_PATH: vendor/bundle
       DISABLE_SPRING: 1
     steps:
-      steps:
-        - name: Checkout code
-          uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-        # Dependencies
-        - name: Install missing libs (This is slated to be added to the base image soon!)
-          run: sudo apt-get -yqq install libpq-dev
-        - name: Setup Ruby
-          uses: ruby/setup-ruby@v1
-        - name: Ruby gem cache
-          uses: actions/cache@v1
-          with:
-            path: vendor/bundle
-            key: v1-${{ runner.os }}-gems-${{ hashFiles('**/good_job.gemspec') }}-${{ hashFiles('**/Gemfile.lock') }}-${{ hashFiles('**/Appraisals') }}
-            restore-keys: |
-              v1-${{ runner.os }}-gems-
-        - name: Install bundler
-          run: gem update --system && gem install bundler -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -1 | tr -d " ")
-        - name: Install Gemfile gems
-          run: bundle install
-        - name: Install Appraisal gems
-          run: bundle exec appraisal install
-        # /Dependencies
+      # Dependencies
+      - name: Install missing libs (This is slated to be added to the base image soon!)
+        run: sudo apt-get -yqq install libpq-dev
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+      - name: Ruby gem cache
+        uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: v1-${{ runner.os }}-gems-${{ hashFiles('**/good_job.gemspec') }}-${{ hashFiles('**/Gemfile.lock') }}-${{ hashFiles('**/Appraisals') }}
+          restore-keys: |
+            v1-${{ runner.os }}-gems-
+      - name: Install bundler
+        run: gem update --system && gem install bundler -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -1 | tr -d " ")
+      - name: Install Gemfile gems
+        run: bundle install
+      - name: Install Appraisal gems
+        run: bundle exec appraisal install --path $BUNDLE_PATH
+      # /Dependencies
 
-        - name: Run linter
-          run: bin/lint --nofix
+      - name: Run linter
+        run: bin/lint --nofix
 
   test:
     name: Test
@@ -79,7 +78,7 @@ jobs:
       - name: Install Gemfile gems
         run: bundle install
       - name: Install Appraisal gems
-        run: bundle exec appraisal install
+        run: bundle exec appraisal install --path $BUNDLE_PATH
       # /Dependencies
 
       - name: Setup test database

diff --git a/Gemfile b/Gemfile
@@ -11,5 +11,7 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
+gem "appraisal", github: 'thoughtbot/appraisal' # https://github.com/thoughtbot/appraisal/pull/165
+
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/thoughtbot/appraisal.git
+  revision: ac8341f81d7c662a6d48e52b2ca12aceffe49e9d
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+
 PATH
   remote: .
   specs:
@@ -67,10 +76,6 @@ GEM
       zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
     ast (2.4.0)
     builder (3.2.4)
     concurrent-ruby (1.1.6)
@@ -206,7 +211,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
+  appraisal!
   database_cleaner
   gem-release
   github_changelog_generator

diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
 gem "rails", "~> 5.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
 gem "rails", "~> 5.2.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
 gem "rails", "~> 6.0.0"
 
 gemspec path: "../"