From e7c5da2fff0e4bac525c409b1c0d0e91d3b9b3c7 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 22 Mar 2021 01:25:59 +0100
Subject: [PATCH] Use bundler-cache: true instead of actions/cache@v2

Using actions/cache@v2 causes problems with ruby, see
https://github.com/ruby/setup-ruby#caching-bundle-install-manually

Closes #8221

closes #8226
---
 .github/workflows/ci.yml | 12 +++++-------
 script/ci/prepare.sh     |  3 ---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2faebcec1..f801ecc92 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,10 @@ jobs:
     env:
       DB: ${{ matrix.db }}
       RAILS_ENV: test
+      BUNDLE_WITH: ${{ matrix.db }}
+      BUNDLE_WITHOUT: development
+      BUNDLE_FROZEN: true
+      BUNDLE_DISABLE_SHARED_GEMS: true
     services:
       postgres:
         image: postgres
@@ -48,15 +52,9 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Prepare
         run: script/ci/prepare.sh
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: bundler-${{ runner.os }}-${{ matrix.ruby }}-${{ matrix.db }}-${{ hashFiles('Gemfile.lock') }}
-      - name: Install dependencies
-        run: bundle
       - name: Run tests
         run: bin/rake --trace ci:${{ matrix.kind }}
       - name: Run Jasmine
diff --git a/script/ci/prepare.sh b/script/ci/prepare.sh
index 6bd574ba4..2a8a46d60 100755
--- a/script/ci/prepare.sh
+++ b/script/ci/prepare.sh
@@ -6,6 +6,3 @@ cp config/database.yml.example config/database.yml
 if [ "${DB}" = "mysql" ]; then
   sed -i 's/*common/*mysql/' config/database.yml
 fi
-
-gem install bundler
-script/configure_bundler