github actions: Switch to action ruby/setup-ruby from deprecated actions/setup-ruby

diff --git a/.github/workflows/cookstyle.yml b/.github/workflows/cookstyle.yml
index d9c87c2c121b16d6acd2849f5fbf652309370e23..a9b8b962c1ec2df0c586427da8eca4b8bfe3d869 100644 (file)
--- 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 ed0ce17cf567ff178a630eda867720d21810c1ec..8bb8dcc154b8452ee1a363cb1003d250e9251579 100644 (file)
--- 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 860487ca19cedeaf219ae3caca5e14df61c44f18..b0f2dcb32fc28c7f80c4d430beab94c89c787578 100644 (file)
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.1
+3.0.4