Skip to content
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] Prepare release 0.118.0 #37386

Merged
merged 4 commits into from
Jan 21, 2025
Merged

[chore] Prepare release 0.118.0 #37386

merged 4 commits into from
Jan 21, 2025

Conversation

opentelemetrybot
Copy link
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
Copy link
Member

songy23 commented Jan 21, 2025

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
165 checks passed
@codeboten codeboten deleted the prepare-release-prs/0.118.0 branch January 21, 2025 18:45
@github-actions github-actions bot added this to the next release milestone Jan 21, 2025
@jade-guiton-dd
Copy link
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.)

chengchuanpeng pushed a commit to chengchuanpeng/opentelemetry-collector-contrib that referenced this pull request Jan 26, 2025
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
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