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

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index cdba19949ef891ffec281613e8ea3aa050d7441f..9fc1320141d9f50d0ac19a5940bc48fdbe9dd87f 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,6 +19,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,6 +33,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 erblint
       run: bundle exec erblint .
         bundler-cache: true
     - name: Run erblint
       run: bundle exec erblint .


@@ -45,9 +47,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: Cache node modules
         bundler-cache: true
     - name: Cache node modules

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

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


@@ -69,6 +72,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 +88,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 +96,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