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

build SDK releases from an opt-out release branch on top of master #9417

Closed
1 task
Tracked by #9252
turadg opened this issue May 28, 2024 · 3 comments
Closed
1 task
Tracked by #9252

build SDK releases from an opt-out release branch on top of master #9417

turadg opened this issue May 28, 2024 · 3 comments
Assignees
Labels
enhancement New feature or request

Comments

@turadg
Copy link
Member

turadg commented May 28, 2024

What is the Problem Being Solved?

Our release branches are made by cherry picking commits from master (opt-in to changes). We've come far enough along that we can invert this to being opt-out. That is, branch off master and then apply commits that revert any changes deemed unsafe.

Tasks

Description of the Design

Security Considerations

Scaling Considerations

Test Plan

Upgrade Considerations

@turadg turadg added the enhancement New feature or request label May 28, 2024
@aj-agoric
Copy link

Placed into @iomekam backlog since he is release manager for 16,

@dckc
Copy link
Member

dckc commented Sep 3, 2024

looks like as of upgrade-16, we're still doing opt-in:

this is based on looking at git log --graph --oneline origin/master origin/dev-upgrade-16
with master = 3c66f4b and dev-upgrade-16 = 0df76a7

@iomekam
Copy link
Contributor

iomekam commented Sep 6, 2024

Our intention was to abide by going with an opt-out flow. However, by the time we started trying to perform the merging, the release branch wasn't in an ideal spot, and doing the merging would have been more overhead. Specifically, there were some changes that landed that would have complicated the merging.

We still released from master, we just did so by cherry-picking instead of merging.

@iomekam iomekam closed this as completed Sep 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

4 participants