Skip to content

Commit 230d7f8

Browse files
Fix merge queue CI (#11797)
#### Description This PR removes the `merge_group` trigger from the two CI checks that failed in merge queues (but not in PRs). See tracking issue for details. The reasoning for simply disabling them instead of modifying them to work in merge queues is three-fold: - For `changelog` to be meaningful, it needs to only run for PRs with no `[chore]` title tag or `Skip changelog` label, but it seems there is no simple way to access this data in merge queue workflows unfortunately. (A possible complicated way may be to parse the ref (PR branch) name and query the title and labels in a script with the `gh` command.) - `api-compatibility` is never meaningful because it seems to have been broken for a long time (see #7443) - Both `changelog` and `api-compatibility` are checks on the _set of changes_ made by a PR, not on the resulting state of the codebase. As such, their result should not meaningfully change when merged against an old main vs. a newer main, making running them in the merge queue pointless. #### Link to tracking issue Fixes #11790 This should let us try [enabling the merge queue](open-telemetry/community#2469) again. #### Testing Testing merge queue checks is unfortunately quite difficult, but since we're only disabling checks I don't foresee any issues.
1 parent d0f5bda commit 230d7f8

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

.github/workflows/api-compatibility.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ on:
99
pull_request:
1010
branches:
1111
- main
12-
merge_group:
13-
types: [checks_requested]
1412

1513
permissions:
1614
contents: read

.github/workflows/changelog.yml

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

1513
concurrency:
1614
group: ${{ github.workflow }}-${{ github.head_ref }}

0 commit comments

Comments
 (0)