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

backporting workflow #4570

Open
s8sato opened this issue May 8, 2024 · 2 comments
Open

backporting workflow #4570

s8sato opened this issue May 8, 2024 · 2 comments
Labels
question Further information is requested

Comments

@s8sato
Copy link
Contributor

s8sato commented May 8, 2024

image
https://blogs.oracle.com/linux/post/backporting-patches-using-git

Regarding backports, my suggestion is to first make commits on the main branch and then apply them to every release branch as needed.

fixes should land on master first, be tested there, and only then be back-ported to older releases.
https://stackoverflow.com/a/13275789

There are some actions that would help this approach:

might be an example:

@s8sato s8sato added question Further information is requested iroha2-dev The re-implementation of a BFT hyperledger in RUST labels May 8, 2024
@mversic mversic removed the iroha2-dev The re-implementation of a BFT hyperledger in RUST label May 16, 2024
@mversic
Copy link
Contributor

mversic commented May 16, 2024

ok, what you suggest this seems better:

  1. make a fix commit to the main branch
  2. cherry-pick the commit to the release branch (forked of at the time of making the 1st tag)

This solves the issue with the CHANGELOG.md. The issue that remains is the CI. We need CI to run on every PR to release branch. I'm not sure how to do that best. Maybe we can have CI workflows that target all branches starting with a prefix, like 2.0.0 (currently we have a branch 2.0.0-pre-rc.21). Or we should remain with stable branch for the latest public release

@s8sato
Copy link
Contributor Author

s8sato commented May 17, 2024

What do you think about having stable/2.0.0 etc. and filtering by stable/ ? However, in that case, the current stable would not coexist with them due to branch name restrictions

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
question Further information is requested
Projects
None yet
Development

No branches or pull requests

2 participants