From c14a096788981c94dd6d2681d4e6d2898adef3ca Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Wed, 13 Apr 2022 23:41:28 +0100
Subject: [PATCH] github actions: Switch to action ruby/setup-ruby from
 deprecated actions/setup-ruby

---
 .github/workflows/cookstyle.yml    | 14 ++------------
 .github/workflows/test-kitchen.yml | 14 ++------------
 .ruby-version                      |  2 +-
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/cookstyle.yml b/.github/workflows/cookstyle.yml
index d9c87c2c1..a9b8b962c 100644
--- a/.github/workflows/cookstyle.yml
+++ b/.github/workflows/cookstyle.yml
@@ -10,18 +10,8 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
-      uses: actions/setup-ruby@v1.1.3
-    - name: Cache gems
-      uses: actions/cache@v3
+      uses: ruby/setup-ruby@v1
       with:
-        path: vendor/bundle
-        key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ runner.OS }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true
     - name: Run cookstyle
       run: bundle exec cookstyle --format fuubar
diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index ed0ce17cf..8bb8dcc15 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -106,22 +106,12 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
-      uses: actions/setup-ruby@v1.1.3
-    - name: Cache gems
-      uses: actions/cache@v3
+      uses: ruby/setup-ruby@v1
       with:
-        path: vendor/bundle
-        key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ runner.OS }}-
+        bundler-cache: true
     - name: Disable apparmor for mysqld
       run: |
         sudo apt-get install apparmor-utils
         sudo aa-disable /usr/sbin/mysqld
-    - name: Install gems
-      run: |
-        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/.ruby-version b/.ruby-version
index 860487ca1..b0f2dcb32 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.1
+3.0.4
-- 
2.39.5