Implement a merge freeze when an "[chore] Update core dependencies" PR on opentelemetry-collector-contrib is present #12837
+10
−1
Conversation
This file contains hidden or 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
|
|
sAchin-680
force-pushed
the
chore/merge-freeze-update-core-deps-pr
branch
from
bcc414e to
b5f796b
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #12837 +/- ##
=======================================
Coverage 91.55% 91.55%
=======================================
Files 499 499
Lines 27089 27089
=======================================
Hits 24801 24801
Misses 1809 1809
Partials 479 479 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
sAchin-680
force-pushed
the
chore/merge-freeze-update-core-deps-pr
branch
3 times, most recently
from
31277db to
a8c7fb7
Compare
|
Hi @mx-psi !! This PR #12837 extends the merge freeze logic to include I've tested the changes locally and verified that the script correctly blocks merges when such PRs are open. Would appreciate it if you could take a look whenever convenient. Thanks ! |
sAchin-680
force-pushed
the
chore/merge-freeze-update-core-deps-pr
branch
3 times, most recently
from
e0e1e6f to
17d872a
Compare
…contrib Signed-off-by: sAchin-680 <[email protected]>
sAchin-680
force-pushed
the
chore/merge-freeze-update-core-deps-pr
branch
from
17d872a to
75c3aaa
Compare
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.
Description
Extend the merge freeze logic in
.github/workflows/scripts/check-merge-freeze.shto include open PRs titled "[chore] Update core dependencies" in theopentelemetry-collector-contrib](https://github.com/open-telemetry/opentelemetry-collector-contribrepository, in addition to the existing check for "[chore] Prepare release" PRs in the core repo.This ensures that no PRs can be merged into
mainwhile a core update PR is pending in contrib, helping us avoid version drift and keep dependencies aligned between core and contrib.Link to tracking issue
Fixes #12830
Testing
Tested locally by:
opentelemetry-collector-contribcheck-merge-freeze.shscript to confirm it correctly blocks mergesDocumentation
No user-facing documentation changes needed. This change only affects internal CI logic.