Merge remote-tracking branch 'upstream/pull/4011'

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 5b6668a840d95a261f8d171735ebf6c377ee736d..8dd3d69a5754616214868ae8cd493cdeea18fbc1 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,11 +3,11 @@ on:
   - push
   - pull_request
 concurrency:
   - push
   - pull_request
 concurrency:

-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

   cancel-in-progress: true
 env:
   os: ubuntu-20.04
   cancel-in-progress: true
 env:
   os: ubuntu-20.04

-  ruby: 2.7
+  ruby: '2.7'

 jobs:
   rubocop:
     name: RuboCop
 jobs:
   rubocop:
     name: RuboCop


@@ -54,11 +54,11 @@ jobs:
         restore-keys: |
           yarn-${{ env.os }}-
     - name: Install node modules
         restore-keys: |
           yarn-${{ env.os }}-
     - name: Install node modules

-      run: bundle exec rake yarn:install
+      run: bundle exec bin/yarn install

     - name: Create dummy database configuration
       run: cp config/example.database.yml config/database.yml
     - name: Run eslint
     - name: Create dummy database configuration
       run: cp config/example.database.yml config/database.yml
     - name: Run eslint

-      run: bundle exec rake eslint
+      run: bundle exec rails eslint

   brakeman:
     name: Brakeman
     runs-on: ubuntu-20.04
   brakeman:
     name: Brakeman
     runs-on: ubuntu-20.04