Skip to content

Commit 64de013

Browse files
[chore] Try fixing merge freeze CI again (#13876)
#### Description Alternative to #13875 and half-revert of #13841: use author login to find the otelbot in PR CI (which historically seems to work), and use author email to find it in merge queue CI (as of yet untested). [Example of the new condition not working in PR CI](#13874)
1 parent 1f869ed commit 64de013

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.email || github.event.merge_group.head_commit.author.email) != '[email protected]')
27+
(!(github.event.pull_request.user.login == 'otelbot[bot]' || github.event.merge_group.head_commit.author.email == '[email protected]'))
2828
runs-on: ubuntu-latest
2929
steps:
3030
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

0 commit comments

Comments
 (0)