From f6b25521a7015800726508d6e8498ef22168eb5e Mon Sep 17 00:00:00 2001
From: Alexander Meindl <alex@alphanodes.com>
Date: Wed, 3 Mar 2021 07:35:24 +0100
Subject: [PATCH] switch from actions/setup-ruby@v1 to ruby/setup-ruby@v1

---
 .github/workflows/linters.yml |  8 ++++----
 .github/workflows/tests.yml   | 14 ++------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 7fa9200..4e74492 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -12,10 +12,11 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: 2.6
+        bundler-cache: true
 
     - name: Set Gemfile
       run: |
@@ -30,7 +31,6 @@ jobs:
 
     - name: Setup gems
       run: |
-        gem install bundler
         bundle install --jobs 4 --retry 3
 
     - name: Run RuboCop
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b59e1b3..b193df8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -78,20 +78,10 @@ jobs:
           libmysqlclient-dev
 
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Setup Cache
-        uses: actions/cache@v1
-        with:
-          path: vendor
-          key: v1-ruby-${{ matrix.ruby }}-redmine-${{ matrix.redmine }}
-
-      - name: Setup Bundler
-        run: |
-          gem install bundler -v '~> 1.0'
-          bundle config path "$(pwd)/vendor/bundle"
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Prepare Redmine source
         working-directory: redmine