Skip to content

Commit 25322ba

Browse files
[chore] Fix merge freeze CI, attempt 3 (#13880)
#### Description Based on [this debug log](https://github.com/open-telemetry/opentelemetry-collector/actions/runs/17922024987/job/50959147505), we can now tell that the payload passed to the merge freeze job in the merge queue CI for otelbot PRs has `author.name = "otelbot[bot]"` and `author.email = "197425009+otelbot[bot]@users.noreply.github.com"`. That email is extremely surprising considering [the patch output for otelbot's commits](https://github.com/open-telemetry/opentelemetry-collector/commit/8e24523e66c3acfeb18dd3086f7f198f3953bae5.patch) has almost the same email, but without the `[bot]` suffix... This PR reverts back to a name-based check for simplicity, and removes the debug log. The result is very similar to #13516, but checking against the correct name. #### Link to tracking issue Fixes #13789
1 parent f98d8b9 commit 25322ba

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

.github/workflows/check-merge-freeze.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,12 @@ on:
1919
permissions: read-all
2020

2121
jobs:
22-
debug:
23-
name: Debug merge queue
24-
if: github.event_name == 'merge_group'
25-
runs-on: ubuntu-latest
26-
env:
27-
MESSAGE: ${{ github.event.merge_group.head_commit.message }}
28-
AUTHOR_NAME: ${{ github.event.merge_group.head_commit.author.name }}
29-
AUTHOR_EMAIL: ${{ github.event.merge_group.head_commit.author.email }}
30-
steps:
31-
- run: |
32-
echo "Merging commit '$MESSAGE' from '$AUTHOR_NAME' ('$AUTHOR_EMAIL')"
33-
3422
check-merge-freeze:
3523
name: Check
3624
# This condition is to avoid blocking the PR causing the freeze in the first place.
3725
if: |
3826
(!startsWith(github.event.pull_request.title || github.event.merge_group.head_commit.message, '[chore] Prepare release')) ||
39-
(!(github.event.pull_request.user.login == 'otelbot[bot]' || github.event.merge_group.head_commit.author.email == '197425009+otelbot@users.noreply.github.com'))
27+
((github.event.pull_request.user.login || github.event.merge_group.head_commit.author.name) == 'otelbot[bot]')
4028
runs-on: ubuntu-latest
4129
steps:
4230
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

0 commit comments

Comments
 (0)