Merge pull request #3552 from rugk/patch-1

[rails.git] / .github / workflows / lint.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9cf224ebb9d7f7ed93ed9a5f6165a0a49fba2513..5b6668a840d95a261f8d171735ebf6c377ee736d 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,6 +2,9 @@ name: Lint
 on:
   - push
   - pull_request
 on:
   - push
   - pull_request

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

 env:
   os: ubuntu-20.04
   ruby: 2.7
 env:
   os: ubuntu-20.04
   ruby: 2.7


@@ -11,23 +14,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Check out code
     runs-on: ubuntu-20.04
     steps:
     - name: Check out code

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

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true

     - name: Run rubocop
       run: bundle exec rubocop --format fuubar
   erblint:
     - name: Run rubocop
       run: bundle exec rubocop --format fuubar
   erblint:


@@ -35,23 +27,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Check out code
     runs-on: ubuntu-20.04
     steps:
     - name: Check out code

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

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true

     - name: Run erblint
       run: bundle exec erblint .
   eslint:
     - name: Run erblint
       run: bundle exec erblint .
   eslint:


@@ -59,30 +40,19 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Check out code
     runs-on: ubuntu-20.04
     steps:
     - name: Check out code

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

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
+        bundler-cache: true

     - name: Cache node modules
     - name: Cache node modules

-      uses: actions/cache@v1
+      uses: actions/cache@v3

       with:
         path: node_modules
         key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
         restore-keys: |
           yarn-${{ env.os }}-
       with:
         path: node_modules
         key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
         restore-keys: |
           yarn-${{ env.os }}-

-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3

     - name: Install node modules
       run: bundle exec rake yarn:install
     - name: Create dummy database configuration
     - name: Install node modules
       run: bundle exec rake yarn:install
     - name: Create dummy database configuration


@@ -94,22 +64,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Check out code
     runs-on: ubuntu-20.04
     steps:
     - name: Check out code

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

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true

     - name: Run brakeman
       run: bundle exec brakeman -q
     - name: Run brakeman
       run: bundle exec brakeman -q