Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/languages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ js:
- name: node-token
value:
- name: node-cache
value:
value: npm
- name: node-cache-dependency-path
value:
dependencies:
Expand Down
8 changes: 7 additions & 1 deletion lib/ghb/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,13 @@ def workflow_set_defaults
end
@new_workflow.env = @old_workflow.env
@new_workflow.defaults = @old_workflow.defaults || {}
@new_workflow.concurrency = @old_workflow.concurrency || {}
@new_workflow.concurrency =
if @old_workflow.concurrency.any?
@old_workflow.concurrency
else
# Cancel superseded full builds when a PR branch is pushed again.
{ group: 'build-${{github.ref}}', 'cancel-in-progress': true }
end
end

def collect_required_status_checks
Expand Down
3 changes: 3 additions & 0 deletions spec/fixtures/workflow_generation/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ permissions:
pull-requests: read
env:
RUBY-BUNDLER-CACHE: true
concurrency:
group: build-${{github.ref}}
cancel-in-progress: true
jobs:
variables:
name: Prepare Variables
Expand Down
Loading