From: Tom Hughes <tom@compton.nu>
Date: Sat, 25 Apr 2020 14:45:02 +0000 (+0100)
Subject: Switch to bundler 2.x
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/31d94ceb8f431dce3e5b8738ee534fe07026267d

Switch to bundler 2.x
---

diff --git a/.github/workflows/cookstyle.yml b/.github/workflows/cookstyle.yml
index a181f72f1..274884da3 100644
--- a/.github/workflows/cookstyle.yml
+++ b/.github/workflows/cookstyle.yml
@@ -20,7 +20,8 @@ jobs:
           bundle-${{ runner.OS }}-
     - name: Install gems
       run: |
-        gem install bundler --version "~> 1.17"
-        bundle install --jobs 4 --retry 3 --deployment
+        gem install bundler
+        bundle config set deployment true
+        bundle install --jobs 4 --retry 3
     - name: Run cookstyle
       run: bundle exec cookstyle --format fuubar
diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 99353fd3f..d6d3f83eb 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -115,7 +115,8 @@ jobs:
         sudo aa-disable /usr/sbin/mysqld
     - name: Install gems
       run: |
-        gem install bundler --version "~> 1.17"
-        bundle install --jobs 4 --retry 3 --deployment
+        gem install bundler
+        bundle config set deployment true
+        bundle install --jobs 4 --retry 3
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
diff --git a/Gemfile.lock b/Gemfile.lock
index 218043aef..ab542f440 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,4 +163,4 @@ DEPENDENCIES
   test-kitchen
 
 BUNDLED WITH
-   1.17.2
+   2.1.4