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

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 94eb05df947fe93486042d95729a88bfe437e856..9fc1320141d9f50d0ac19a5940bc48fdbe9dd87f 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,69 +6,98 @@ 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-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:
         ruby-version: ${{ env.ruby }}
     - name: Setup 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
   erblint:
     name: ERB Lint
         bundler-cache: true
     - name: Run rubocop
       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:
         ruby-version: ${{ env.ruby }}
     - name: Setup 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 .
   eslint:
     name: ESLint
         bundler-cache: true
     - name: Run erblint
       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:
         ruby-version: ${{ env.ruby }}
     - name: Setup 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') }}
         restore-keys: |
           yarn-${{ env.os }}-
     - name: Install node modules
       with:
         path: node_modules
         key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
         restore-keys: |
           yarn-${{ env.os }}-
     - name: Install node modules

-      run: bundle exec rails 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
       run: bundle exec rails eslint
   brakeman:
     name: Brakeman
     - name: Create dummy database configuration
       run: cp config/example.database.yml config/database.yml
     - name: Run eslint
       run: bundle exec rails eslint
   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:
         ruby-version: ${{ env.ruby }}
     - name: Setup 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

+  annotate_models:
+    env:
+      RAILS_ENV: test
+    name: Rails Annotate Models
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+    - name: Setup ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ env.ruby }}
+        rubygems: 3.4.10
+        bundler-cache: true
+    - name: Setup database
+      run: |
+        sudo systemctl start postgresql
+        sudo -u postgres createuser -s $(id -un)
+        createdb openstreetmap
+        cp config/github.database.yml config/database.yml
+        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
+      run: git diff --exit-code