Switch most tests to run on Ubuntu 22.04

[chef.git] / .github / workflows / cookstyle.yml

diff --git a/.github/workflows/cookstyle.yml b/.github/workflows/cookstyle.yml
index e916ad489b577c425ed7bb20edf5413e037ed775..43494fc14d9dd6f4e8ae5ef4af5e2727a26436cb 100644 (file)
--- a/.github/workflows/cookstyle.yml
+++ b/.github/workflows/cookstyle.yml
@@ -1,27 +1,23 @@
 name: Cookstyle
 name: Cookstyle

+

 on:
   - push
   - pull_request
 on:
   - push
   - pull_request

+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+

 jobs:
   cookstyle:
     name: Cookstyle
     runs-on: ubuntu-latest
     steps:
     - name: Check out code
 jobs:
   cookstyle:
     name: Cookstyle
     runs-on: ubuntu-latest
     steps:
     - name: Check out code

-      uses: actions/checkout@v2
+      uses: actions/checkout@v3

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
-    - name: Cache gems
-      uses: actions/cache@v2
+      uses: ruby/setup-ruby@v1

       with:
       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
     - name: Run cookstyle
       run: bundle exec cookstyle --format fuubar