X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f041893ead4ee6e96baf8819319b3c089f8c3595..2c497aee7a45c31ae6d1a448c35ce1b3f0ebb608:/.github/workflows/lint.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 84ce14afc..11a4c322f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,6 +2,9 @@ name: Lint on: - push - pull_request +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + cancel-in-progress: true env: os: ubuntu-20.04 ruby: 2.7 @@ -11,23 +14,12 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 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 + bundler-cache: true - name: Run rubocop run: bundle exec rubocop --format fuubar erblint: @@ -35,23 +27,12 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 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 + bundler-cache: true - name: Run erblint run: bundle exec erblint . eslint: @@ -59,30 +40,19 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 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 }}- + bundler-cache: true - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v3 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 run: bundle exec rake yarn:install - name: Create dummy database configuration @@ -94,22 +64,11 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 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 + bundler-cache: true - name: Run brakeman run: bundle exec brakeman -q