Skip to content

[chore] Prepare release 0.118.0#37386

Merged
codeboten merged 4 commits into
mainfrom
prepare-release-prs/0.118.0
Jan 21, 2025
Merged

[chore] Prepare release 0.118.0#37386
codeboten merged 4 commits into
mainfrom
prepare-release-prs/0.118.0

Conversation

@opentelemetrybot

Copy link
Copy Markdown
Contributor

The following commands were run to prepare this release:

  • make chlog-update VERSION=v0.118.0
  • sed -i.bak s/0[.]117[.]0/0.118.0/g versions.yaml
  • make multimod-prerelease
  • make multimod-sync

@songy23

songy23 commented Jan 21, 2025

Copy link
Copy Markdown
Member

side note: the merge freeze workflow is working fine for PRs that are up-to-date with mainline https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/12893441428/job/35950354844?pr=37384

However, for PRs that are approved but not up to date, they can still be merged. Guess this can be fixed once merge queue is enabled in this repo.

Screenshot 2025-01-21 at 1 42 56 PM

cc @jade-guiton-dd @mx-psi

@codeboten codeboten merged commit 216e51a into main Jan 21, 2025
@codeboten codeboten deleted the prepare-release-prs/0.118.0 branch January 21, 2025 18:45
@jade-guiton-dd

Copy link
Copy Markdown
Contributor

@songy23 Yes, that's the expected behavior. AFAIK, the only way to have updated merge freeze status on PRs would be to go through every open PR and rerun the check, which is a bit complex to automate, so (at least for now) we've decided to rely on the merge queue for proper enforcement.

Thank you for checking by the way! (I had planned to do it myself with a draft PR but forgot that it would happen in the evening here.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants