Skip to content

Commit 1da6de7

Browse files
committed
ci: Enable GitHub Merge Queue support
1 parent 6aca7fb commit 1da6de7

4 files changed

Lines changed: 17 additions & 4 deletions

File tree

.github/workflows/changelog.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
types: [opened, synchronize, reopened, labeled, unlabeled]
1010
branches:
1111
- main
12+
merge_group:
1213

1314
permissions:
1415
contents: read
@@ -17,6 +18,7 @@ jobs:
1718
changelog:
1819
runs-on: ubuntu-latest
1920
if: |
21+
github.event_name != 'merge_group' &&
2022
!contains(github.event.pull_request.labels.*.name, 'Skip Changelog')
2123
&& github.actor != 'otelbot[bot]'
2224

.github/workflows/check-links.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,23 @@ on:
1313
- '**/*.rst'
1414
- '.github/workflows/check-links.yml'
1515
- '.github/workflows/check_links_config.json'
16+
merge_group:
17+
paths:
18+
- '**/*.md'
19+
- '**/*.rst'
20+
- '.github/workflows/check-links.yml'
21+
- '.github/workflows/check_links_config.json'
1622

1723
permissions:
1824
contents: read
1925

2026
concurrency:
21-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
27+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_sha || github.run_id }}
2228
cancel-in-progress: true
2329

30+
env:
31+
DIFF_RANGE: ${{ github.event_name == 'merge_group' && format('{0}...{1}', github.event.merge_group.base_sha, github.event.merge_group.head_sha) || format('origin/{0}...HEAD', github.base_ref) }}
32+
2433
jobs:
2534
check-links:
2635
runs-on: ubuntu-latest
@@ -53,14 +62,14 @@ jobs:
5362
${{ steps.changed-files.outputs.all_changed_files }} \
5463
|| { echo "Check that anchor links are lowercase"; exit 1; }
5564
56-
- name: Check new links only on pull requests
57-
if: steps.changed-files.outputs.any_changed == 'true' && github.event_name == 'pull_request'
65+
- name: Check new links only on pull requests and merge groups
66+
if: steps.changed-files.outputs.any_changed == 'true' && (github.event_name == 'pull_request' || github.event_name == 'merge_group')
5867
run: |
5968
# Extract URLs only from added lines in the diff to avoid
6069
# rate limiting when checking all links in large files like
6170
# CHANGELOG.md. Only new/changed links are checked on PRs;
6271
# pushes to main still check all links in changed files.
63-
git diff "origin/${{ github.base_ref }}...HEAD" -- \
72+
git diff "$DIFF_RANGE" -- \
6473
${{ steps.changed-files.outputs.all_changed_files }} \
6574
| grep '^+' | grep -v '^+++' \
6675
| grep -oP 'https?://[^\s\)\]\"'"'"'`>]+' \

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
branches:
99
- 'main'
1010
pull_request:
11+
merge_group:
1112

1213
permissions:
1314
contents: read

.github/workflows/templates/ci.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
branches:
99
- 'main'
1010
pull_request:
11+
merge_group:
1112

1213
permissions:
1314
contents: read

0 commit comments

Comments
 (0)