-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[chore] Fix check merge freeze job #12045
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #12045 +/- ##
=======================================
Coverage 91.67% 91.67%
=======================================
Files 455 455
Lines 24038 24038
=======================================
Hits 22037 22037
Misses 1629 1629
Partials 372 372 ☔ View full report in Codecov by Sentry. |
a46c9b8
to
9b68d59
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
9b68d59
to
4e7a8f0
Compare
I verified the condition works now |
maybe close #12043 for now and reopen later? |
4e7a8f0
to
94a8f03
Compare
94a8f03
to
439426f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just checking the description mentions the merge_group
event twice, but the change here is on the pull_request
event as well, is this just a typo in the description?
Just typo. Thanks for catching. Updated |
7b804b5
In open-telemetry#12045, I assumed that `github.event.pull_request.user.name` would be present, but apparently it's not. So we need to switch back to using `github.event.pull_request.user.login`
Sorry for all the trouble @dmitryax... We weren't able to test the merge group check independently, but I should probably have seen this coming. |
To unblock #12043, which is always rejected on the queue.
Apparently,
github.event.merge_group.head_commit.author.name
isOpenTelemetry Bot
notopentelemetrybot
. See https://github.com/open-telemetry/opentelemetry-collector/actions/runs/12658978490/job/35277057933.Since
github.event.merge_group.head_commit.author
doesn't havelogin
field, I've switched the condition to use thename
field on bothgithub.event.pull_request.user
andgithub.event.merge_group.head_commit.author