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

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 5b6668a840d95a261f8d171735ebf6c377ee736d..685937b034ea026708e29bb1edc2ebcb5b02ec4f 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,18 +3,18 @@ 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:
   cancel-in-progress: true
 env:

-  os: ubuntu-20.04
-  ruby: 2.7
+  os: ubuntu-22.04
+  ruby: '3.0'

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

-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04

     steps:
     - name: Check out code
     steps:
     - name: Check out code

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

     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:


@@ -24,10 +24,10 @@ jobs:
       run: bundle exec rubocop --format fuubar
   erblint:
     name: ERB Lint
       run: bundle exec rubocop --format fuubar
   erblint:
     name: ERB Lint

-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04

     steps:
     - name: Check out code
     steps:
     - name: Check out code

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

     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:


@@ -37,10 +37,10 @@ jobs:
       run: bundle exec erblint .
   eslint:
     name: ESLint
       run: bundle exec erblint .
   eslint:
     name: ESLint

-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04

     steps:
     - name: Check out code
     steps:
     - name: Check out code

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

     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:


@@ -54,17 +54,17 @@ 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
   brakeman:
     name: Brakeman

-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04

     steps:
     - name: Check out code
     steps:
     - name: Check out code

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

     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with: