Skip to content

Commit

Permalink
[CI] Adjust cancel-in-progress concurrency (forem#19244)
Browse files Browse the repository at this point in the history
* [CI] Adjust cancel-in-progress concurrency

* Revert "[CI] Lock setup-ruby to v1.144.0 (forem#19243)"

This reverts commit 44a3527.
  • Loading branch information
Mac Siri authored Mar 21, 2023
1 parent 842e688 commit b7f0070
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

env:
COVERAGE: true
Expand All @@ -26,7 +26,7 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1.144.0
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true

Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
key: ${{ runner.os }}-precompiled-assets-${{ hashFiles('app/assets/**', 'app/javascript/**', 'config/webpack/**', 'config/webpacker.yml', '**/package.json', '**/yarn.lock') }}
restore-keys: ${{ runner.os }}-precompiled-assets-
- name: setup ruby
uses: ruby/setup-ruby@v1.144.0
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
if: steps.precompiled-asset.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: setup ruby
uses: ruby/setup-ruby@v1.144.0
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- uses: actions/setup-node@v3
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
node-version: 16
cache: yarn
- name: setup ruby
uses: ruby/setup-ruby@v1.144.0
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- run: bundle exec rails db:test:prepare
Expand Down Expand Up @@ -297,7 +297,7 @@ jobs:
node-version: 16
cache: yarn
- name: setup ruby
uses: ruby/setup-ruby@v1.144.0
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- run: bundle exec rails assets:precompile
Expand Down Expand Up @@ -349,7 +349,7 @@ jobs:
node-version: 16
cache: yarn
- name: setup ruby
uses: ruby/setup-ruby@v1.144.0
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- run: bundle exec rails db:test:prepare
Expand Down

0 comments on commit b7f0070

Please sign in to comment.