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

Release from a "release" branch #37

Closed
1 of 7 tasks
eladb opened this issue Dec 10, 2019 · 2 comments
Closed
1 of 7 tasks

Release from a "release" branch #37

eladb opened this issue Dec 10, 2019 · 2 comments
Assignees
Labels
ops Operations status/done Implementation complete

Comments

@eladb
Copy link
Contributor

eladb commented Dec 10, 2019

PR Champion
#

Description

Progress

  • Tracking Issue Created
  • RFC PR Created
  • Core Team Member Assigned
  • Initial Approval / Final Comment Period
  • Ready For Implementation
    • implementation issue 1
  • Resolved
@eladb eladb added the ops Operations label Dec 10, 2019
@MrArnoldPalmer MrArnoldPalmer self-assigned this Jan 4, 2020
@MrArnoldPalmer MrArnoldPalmer added the status/proposed Newly proposed RFC label Jan 4, 2020
@MrArnoldPalmer
Copy link
Contributor

MrArnoldPalmer commented Jan 14, 2020

A "release" branch has been defined in aws-cdk and jsii and we have started triggering our release with pushes to this branch. The abridged version of the process is as follows.

  1. bugfixes and feature work are continously PRd and merged into master
  2. when master is in the desired state for publishing, a new branch is created from it and the bump script is run on this branch.
  3. a pull request is made from the new branch into "release", when merged the publish pipeline is triggered
  4. a pull request is made from the release branch into master with updates to the changelog and content from bump.

This being done, the process is still not perfect. We avoid the main problem we were trying to solve which was PRs can continue to merge into master during the release process without "sneaking" into the release and the changelog stays up to date. We have introduced more manual steps though and ideally we can eliminate those where possible.

With that, a full proposal can and should be made regarding our desired publishing workflow. We should detail any new or changed automation and how the branching workflow correlates. What those things are will become clear as we leverage the new release branch for a few more rounds of publishing.

@eladb
Copy link
Contributor Author

eladb commented Mar 3, 2020

Done!

@eladb eladb closed this as completed Mar 3, 2020
@eladb eladb added status/done Implementation complete and removed status/proposed Newly proposed RFC labels Mar 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ops Operations status/done Implementation complete
Projects
None yet
Development

No branches or pull requests

2 participants