Skip to content

Commit 7b804b5

Browse files
authored
[chore] Fix check merge freeze job (#12045)
To unblock #12043, which is always rejected on the queue. Apparently, `github.event.merge_group.head_commit.author.name` is `OpenTelemetry Bot` not `opentelemetrybot`. See https://github.com/open-telemetry/opentelemetry-collector/actions/runs/12658978490/job/35277057933. Since `github.event.merge_group.head_commit.author` doesn't have `login` field, I've switched the condition to use the `name` field on both `github.event.pull_request.user` and `github.event.merge_group.head_commit.author`
1 parent 286b2f5 commit 7b804b5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# This condition is to avoid blocking the PR causing the freeze in the first place.
2525
if: |
2626
(!startsWith(github.event.pull_request.title || github.event.merge_group.head_commit.message, '[chore] Prepare release')) ||
27-
(github.event.pull_request.user.login || github.event.merge_group.head_commit.author.name) != 'opentelemetrybot'
27+
(github.event.pull_request.user.name || github.event.merge_group.head_commit.author.name) != 'OpenTelemetry Bot'
2828
runs-on: ubuntu-latest
2929
steps:
3030
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

0 commit comments

Comments
 (0)