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

ci: prepare release script to run on v1.x branch #5276

Merged

Conversation

pichlermarc
Copy link
Member

@pichlermarc pichlermarc commented Dec 16, 2024

Which problem is this PR solving?

Once we merge next into main, we'll need to continue publishing on v1.x.
This PR prepares the release scripts to do that. I'll re-target to the v1.x branch once we have set it up.

Steps:

Then we can

  • merge next to main (the other way around for once)

From then on we can continue backporting to and releasing from v1.x, independently of what's on main

Copy link

codecov bot commented Dec 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.66%. Comparing base (616d27a) to head (8425d90).
Report is 1 commits behind head on v1.x.

Additional details and impacted files
@@           Coverage Diff           @@
##             v1.x    #5276   +/-   ##
=======================================
  Coverage   94.66%   94.66%           
=======================================
  Files         322      322           
  Lines        8058     8058           
  Branches     1632     1632           
=======================================
  Hits         7628     7628           
  Misses        430      430           

@pichlermarc pichlermarc force-pushed the chore/1.x-release-script branch from 38fdc69 to bd68166 Compare December 17, 2024 16:02
Copy link
Contributor

@chancancode chancancode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my review doesn't really count, but FWIW, I did check that:

  1. everything in these two files seems to be updated appropriately, and
  2. I didn't see anything in the scripts/*.js referenced here that would need to be updated

@pichlermarc pichlermarc changed the base branch from main to v1.x December 18, 2024 12:04
@pichlermarc pichlermarc added this to the OpenTelemetry SDK 2.0 milestone Dec 18, 2024
@pichlermarc pichlermarc marked this pull request as ready for review December 18, 2024 15:07
@pichlermarc pichlermarc requested a review from a team as a code owner December 18, 2024 15:07
@maryliag
Copy link
Contributor

Trying to understand: after next gets merged to main, don't you want to have published on v1 and main? This seems to be replacing to just v1, but how things on main would keep getting published?

Copy link
Contributor

@trentm trentm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth having a "1.x" section or note to doc/contributing/releasing.md?

@pichlermarc
Copy link
Member Author

pichlermarc commented Dec 18, 2024

Trying to understand: after next gets merged to main, don't you want to have published on v1 and main? This seems to be replacing to just v1, but how things on main would keep getting published?

@maryliag yes, we want to publish from both:

  • backported fixes from v1.x
  • 2.x versions starting febuary from main

This workflow gets changed only on the v1.x branch (which is the target for this PR), one can change from which branch the workflow is to be used when triggering it. So when we choose v1.x the PR gets created targeted to v1.x (this change here), but if we choose main we release from main. 🙂

@pichlermarc
Copy link
Member Author

Worth having a "1.x" section or note to doc/contributing/releasing.md?

Good point, updated it here 69675f8 - steps largely remain the same :)

@pichlermarc
Copy link
Member Author

pichlermarc commented Dec 18, 2024

I'll port the docs changes forward to main after merging next back so we have it there as well.

@maryliag
Copy link
Contributor

duh... completely missed this was on v1 branch! My mistake, now makes sense 😄

@pichlermarc pichlermarc merged commit aae4468 into open-telemetry:v1.x Dec 18, 2024
17 checks passed
@pichlermarc pichlermarc deleted the chore/1.x-release-script branch December 18, 2024 16:18
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.

4 participants