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 v1.23.0/v0.117.0 #12043

Merged
merged 13 commits into from
Jan 7, 2025
Merged

Conversation

opentelemetrybot
Copy link
Contributor

@opentelemetrybot opentelemetrybot commented Jan 7, 2025

The following commands were run to prepare this release:

  • make chlog-update VERSION=v1.23.0/v0.117.0
  • make prepare-release PREVIOUS_VERSION=1[.]22[.]0 RELEASE_CANDIDATE=1.23.0 MODSET=stable
  • make prepare-release PREVIOUS_VERSION=0[.]116[.]0 RELEASE_CANDIDATE=0.117.0 MODSET=beta

This PR also includes fix #12051 to reduce back-and-forths

@dmitryax dmitryax enabled auto-merge January 7, 2025 19:04
Copy link

codecov bot commented Jan 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.67%. Comparing base (7b804b5) to head (22cbd71).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #12043   +/-   ##
=======================================
  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.
📢 Have feedback on the report? Share it here.

@dmitryax dmitryax added this pull request to the merge queue Jan 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 7, 2025
@dmitryax dmitryax added this pull request to the merge queue Jan 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 7, 2025
@dmitryax dmitryax enabled auto-merge January 7, 2025 19:22
@dmitryax dmitryax added this pull request to the merge queue Jan 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 7, 2025
dmitryax added a commit to dmitryax/opentelemetry-collector that referenced this pull request Jan 7, 2025
not going to be merged
@dmitryax dmitryax changed the title TEMP-UNBLOCK-OTHER_PRs [chore] Prepare release v1.23.0/v0.117.0 [chore] Prepare release v1.23.0/v0.117.0 Jan 7, 2025
@dmitryax dmitryax closed this Jan 7, 2025
@dmitryax dmitryax reopened this Jan 7, 2025
@dmitryax dmitryax enabled auto-merge January 7, 2025 20:25
@dmitryax dmitryax added this pull request to the merge queue Jan 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 7, 2025
@dmitryax
Copy link
Member

dmitryax commented Jan 7, 2025

Apparently github.event.merge_group.head_commit.author.name is OpenTelemetry Bot not opentelemetrybot

@dmitryax dmitryax changed the title [chore] Prepare release v1.23.0/v0.117.0 TMP-UNBLOCK-MERGE-FREEZE [chore] Prepare release v1.23.0/v0.117.0 Jan 7, 2025
@dmitryax dmitryax changed the title TMP-UNBLOCK-MERGE-FREEZE [chore] Prepare release v1.23.0/v0.117.0 [chore] TMP-UNBLOCK-MERGE-FREEZE Prepare release v1.23.0/v0.117.0 Jan 7, 2025
@dmitryax dmitryax changed the title [chore] TMP-UNBLOCK-MERGE-FREEZE Prepare release v1.23.0/v0.117.0 [chore] Prepare release v1.23.0/v0.117.0 Jan 7, 2025
@dmitryax
Copy link
Member

dmitryax commented Jan 7, 2025

Closing temporarily to unblock #12045

@dmitryax dmitryax closed this Jan 7, 2025
github-merge-queue bot pushed a commit that referenced this pull request Jan 7, 2025
To unblock
#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`
@dmitryax dmitryax reopened this Jan 7, 2025
@dmitryax dmitryax enabled auto-merge January 7, 2025 21:46
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

<!-- Issue number if applicable -->
#### Link to tracking issue
Fixes #

<!--Describe what testing was performed and which tests were added.-->
#### Testing

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->
@dmitryax dmitryax added this pull request to the merge queue Jan 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 7, 2025
@dmitryax dmitryax added this pull request to the merge queue Jan 7, 2025
Merged via the queue into main with commit 795f727 Jan 7, 2025
71 checks passed
@dmitryax dmitryax deleted the prepare-release-prs/0.117.0 branch January 7, 2025 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants