[chore] Fix check merge freeze job #12045
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
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
TylerHelmuth
approved these changes
Jan 7, 2025
codeboten
reviewed
Jan 7, 2025
songy23
approved these changes
Jan 7, 2025
Just typo. Thanks for catching. Updated |
Merged
via the queue into
open-telemetry:main
with commit Jan 7, 2025
7b804b5
44 of 45 checks passed
dmitryax
added a commit
to dmitryax/opentelemetry-collector
that referenced
this pull request
Jan 7, 2025
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. |
|
@jade-guiton-dd, no worries. I realize it's hard to test without trying. Thanks for all the improvements! |
sfc-gh-sili
pushed a commit
to sfc-gh-sili/opentelemetry-collector
that referenced
this pull request
Jan 15, 2025
To unblock open-telemetry#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`
mx-psi
added a commit
to open-telemetry/opentelemetry-collector-contrib
that referenced
this pull request
Jan 15, 2025
#### Description As stated in the [Release Procedure document](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/release.md#releasing-opentelemetry-collector-contrib), all merging in Contrib should be halted while the "Prepare release" PR is open. This PR adds a CI check which fails if such a release PR is currently open. This is the same as the CI check introduced in Core as part of [this issue](open-telemetry/opentelemetry-collector#11707) ([Initial PR](open-telemetry/opentelemetry-collector#11744), [bug](open-telemetry/opentelemetry-collector#11808), [fix](open-telemetry/opentelemetry-collector#11849), [bug 2](open-telemetry/opentelemetry-collector#11906), [fix 2](open-telemetry/opentelemetry-collector#11936), [fix 3](open-telemetry/opentelemetry-collector#12045), [fix 4](open-telemetry/opentelemetry-collector#12051)). Like its predecessor, this will only be fully effective once the merge queue is enabled on this repo (see #36788 for progress on that), enabling us to do proper last-minute checks instead of relying on the freeze status at the time of the latest PR update. Similarly, for proper enforcement, this check will need to be marked as required in the main branch protections (I will create an issue on the community repo to that effect once this PR is merged). #### Link to tracking issue Updates #36848 #### Testing Considering the multiple iterations this code went through on Core, it should now work properly without adaptation. However, considering the multiple iterations this code went through on Core, we should expect the unexpected, especially when it comes to the interaction with the merge queue, so release managers will need to be aware of this change, in case it breaks the release process. --------- Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com> Co-authored-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To unblock #12043, which is always rejected on the queue.
Apparently,
github.event.merge_group.head_commit.author.nameisOpenTelemetry Botnotopentelemetrybot. See https://github.com/open-telemetry/opentelemetry-collector/actions/runs/12658978490/job/35277057933.Since
github.event.merge_group.head_commit.authordoesn't haveloginfield, I've switched the condition to use thenamefield on bothgithub.event.pull_request.userandgithub.event.merge_group.head_commit.author