maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[CI] Adjust cancel-in-progress concurrency (#19244)

Browse source 
* [CI] Adjust cancel-in-progress concurrency

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

This reverts commit 44a3527983.
This commit is contained in:
Mac Siri 2023-03-21 10:05:31 -04:00 • committed by GitHub
parent 842e6880b8
commit b7f00706bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/ci-cd.yml vendored
View file

@ -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
@ -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
@ -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'
@ -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
@ -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
@ -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
@ -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