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

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index cdba19949ef891ffec281613e8ea3aa050d7441f..8383068b3f08d9e8893a1692334f51f55f254cdd 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,12 +6,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 env:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 env:

-  os: ubuntu-22.04
-  ruby: '3.0'
+  ruby: '3.1'

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

-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest

     steps:
     - name: Check out code
       uses: actions/checkout@v4
     steps:
     - name: Check out code
       uses: actions/checkout@v4


@@ -19,6 +18,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}

+        rubygems: 3.4.10

         bundler-cache: true
     - name: Run rubocop
       run: bundle exec rubocop --format fuubar
         bundler-cache: true
     - name: Run rubocop
       run: bundle exec rubocop --format fuubar


@@ -32,9 +32,10 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}

+        rubygems: 3.4.10

         bundler-cache: true
     - name: Run erblint
         bundler-cache: true
     - name: Run erblint

-      run: bundle exec erblint .
+      run: bundle exec erb_lint .

   eslint:
     name: ESLint
     runs-on: ubuntu-22.04
   eslint:
     name: ESLint
     runs-on: ubuntu-22.04


@@ -45,14 +46,12 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}

+        rubygems: 3.4.10

         bundler-cache: true
     - name: Cache node modules
         bundler-cache: true
     - name: Cache node modules

-      uses: actions/cache@v3
+      uses: actions/setup-node@v4

       with:
       with:

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

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


@@ -69,6 +68,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}

+        rubygems: 3.4.10

         bundler-cache: true
     - name: Run brakeman
       run: bundle exec brakeman -q
         bundler-cache: true
     - name: Run brakeman
       run: bundle exec brakeman -q


@@ -84,6 +84,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ env.ruby }}

+        rubygems: 3.4.10

         bundler-cache: true
     - name: Setup database
       run: |
         bundler-cache: true
     - name: Setup database
       run: |


@@ -91,7 +92,7 @@ jobs:
         sudo -u postgres createuser -s $(id -un)
         createdb openstreetmap
         cp config/github.database.yml config/database.yml
         sudo -u postgres createuser -s $(id -un)
         createdb openstreetmap
         cp config/github.database.yml config/database.yml

-        bundle exec rails db:test:load
+        bundle exec rails db:schema:load

     - name: Run Annotate Models
       run: bundle exec rails annotate_models
     - name: Fail if model annotations are out of date
     - name: Run Annotate Models
       run: bundle exec rails annotate_models
     - name: Fail if model annotations are out of date