Skip to content

Commit 204a9be

Browse files
enable merge-group for downstreams build op (GoogleCloudPlatform#12920)
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
1 parent 1003475 commit 204a9be

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/build-downstream.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ on:
1010
type: string
1111

1212
concurrency:
13-
group: ${{ inputs.repo }}-${{ github.event_name == 'pull_request' && format('pr-{0}-', github.event.pull_request.number) || format('commit-{0}', github.sha) }}
13+
group: ${{ inputs.repo }}-${{ github.event_name == 'merge_group' && format('merge-group-{0}', github.event.merge_group.head_sha) || github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('commit-{0}', github.sha) }}
1414
cancel-in-progress: true
1515

1616
jobs:
1717
generate-repository:
1818
runs-on: ubuntu-22.04
1919
env:
20-
BASE_BRANCH: ${{ github.event.pull_request.base.ref || github.ref_name }}
20+
BASE_BRANCH: ${{ github.event_name == 'merge_group' && github.event.merge_group.base_ref || github.event.pull_request.base.ref || github.ref_name }}
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
steps:
2323
- name: Checkout Repository

.github/workflows/downstreams.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ on:
66
branches:
77
- main
88
- 'FEATURE-BRANCH-*'
9+
merge_group:
10+
types: [checks_requested]
11+
912

1013
concurrency:
11-
group: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('commit-{0}', github.sha) }}
14+
group: ${{ github.event_name == 'merge_group' && format('merge-group-{0}', github.event.merge_group.head_sha) || github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('commit-{0}', github.sha) }}
1215
cancel-in-progress: true
1316

1417
jobs:

0 commit comments

Comments
 (0)