Merge pull request #3860 from gravitystorm/yaml_quoting

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0042817d85877ba7e5b1942197cb87c202d33e71..bd02bd6240d8f5ff9543f2854f6304b5af5cfc13 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,11 +3,11 @@ 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:
   os: ubuntu-20.04
   cancel-in-progress: true
 env:
   os: ubuntu-20.04

-  ruby: 2.7
+  ruby: '2.7'

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


@@ -16,21 +16,10 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby

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

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

-    - name: Cache gems
-      uses: actions/cache@v3
-      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
+        bundler-cache: true

     - name: Run rubocop
       run: bundle exec rubocop --format fuubar
   erblint:
     - name: Run rubocop
       run: bundle exec rubocop --format fuubar
   erblint:


@@ -40,21 +29,10 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby

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

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

-    - name: Cache gems
-      uses: actions/cache@v3
-      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
+        bundler-cache: true

     - name: Run erblint
       run: bundle exec erblint .
   eslint:
     - name: Run erblint
       run: bundle exec erblint .
   eslint:


@@ -64,16 +42,10 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby

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

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

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

     - name: Cache node modules
       uses: actions/cache@v3
       with:
     - name: Cache node modules
       uses: actions/cache@v3
       with:


@@ -81,17 +53,12 @@ jobs:
         key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
         restore-keys: |
           yarn-${{ env.os }}-
         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 rails 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
     runs-on: ubuntu-20.04
   brakeman:
     name: Brakeman
     runs-on: ubuntu-20.04


@@ -99,20 +66,9 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby
     - name: Check out code
       uses: actions/checkout@v3
     - name: Setup ruby

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

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

-    - name: Cache gems
-      uses: actions/cache@v3
-      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
+        bundler-cache: true

     - name: Run brakeman
       run: bundle exec brakeman -q
     - name: Run brakeman
       run: bundle exec brakeman -q