Skip to content

Conversation

@kfindeisen
Copy link
Member

This PR documents how to backport bug fixes onto a release branch, and modifies the existing docs and workflows to account for the existence of release branches.

Copy link
Member

@isullivan isullivan left a comment

Choose a reason for hiding this comment

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

The changes look good to me, but not marking as approved since there are still other reviewers.


.. code-block:: sh
git checkout -b tickets/DM-XXXXX-X.Y tickets/DM-XXXXX
Copy link
Member

Choose a reason for hiding this comment

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

Here and later, did you mean:
git checkout -b tickets/DM-XXXXX-X.Y.Z tickets/DM-XXXXX

Copy link
Member Author

Choose a reason for hiding this comment

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

No, that was intentional -- it's the copy of tickets/DM-XXXXX being merged into the X.Y branch (by analogy to the -v23 suffix in the Science Pipelines policy).

Copy link
Member Author

Choose a reason for hiding this comment

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

Also, GitHub tracks each reviewer's approval/disapproval separately. 🙂

We will now have branches of the form release/X.Y.
This process is based on the Science Pipelines backport process at
https://developer.lsst.io/work/backports.html, but streamlined to allow
for rapid deployment.
This is analogous to building on merge to main, and makes it easier to
do any final pre-release testing.
@kfindeisen kfindeisen merged commit d0f40c6 into main Oct 2, 2024
7 checks passed
@kfindeisen kfindeisen deleted the tickets/DM-46530 branch October 2, 2024 21:46
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.

5 participants