Merge branch 'pull/4985'

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9cf224ebb9d7f7ed93ed9a5f6165a0a49fba2513..06f6ff841bbf7c32b274beb973af64adf7f641a4 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,114 +2,102 @@ name: Lint
 on:
   - push
   - pull_request
 on:
   - push
   - pull_request

+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true

 env:
 env:

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

 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@v2.3.4
+      uses: actions/checkout@v4

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        rubygems: 3.4.10
+        bundler-cache: true

     - name: Run rubocop
       run: bundle exec rubocop --format fuubar
   erblint:
     name: ERB Lint
     - 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@v2.3.4
+      uses: actions/checkout@v4

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        rubygems: 3.4.10
+        bundler-cache: true

     - name: Run erblint
     - name: Run erblint

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

   eslint:
     name: ESLint
   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@v2.3.4
+      uses: actions/checkout@v4

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
+        rubygems: 3.4.10
+        bundler-cache: true

     - name: Cache node modules
     - name: Cache node modules

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

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

-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3

     - name: Install node modules
     - 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@v2.3.4
+      uses: actions/checkout@v4

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1

       with:
         ruby-version: ${{ env.ruby }}
       with:
         ruby-version: ${{ env.ruby }}

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ env.os }}-${{ env.ruby }}-
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
+        rubygems: 3.4.10
+        bundler-cache: true

     - name: Run brakeman
       run: bundle exec brakeman -q
     - 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