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

Keep Horreum branch fixed while backporting #12

Open
lampajr opened this issue Apr 12, 2024 · 0 comments
Open

Keep Horreum branch fixed while backporting #12

lampajr opened this issue Apr 12, 2024 · 0 comments
Labels
bug Something isn't working

Comments

@lampajr
Copy link
Member

lampajr commented Apr 12, 2024

Describe the bug

Right now while backporting changes to the stable branch, e.g., 0.12.x, and given the actual merge strategy we hit the issue that the backporting PR tries to change the HORREUM_BRANCH in the Makefile to the master one.

Example of PR: #11 (ignore the latest commit I added to revert that change)

To Reproduce

Backport a pull request.

Version

From main branch

Proposal

Either we change the merge / cherry-pick strategy or we create a simple script that sets the HORREUM_BRANCH based on the actual backporting target.

@lampajr lampajr added the bug Something isn't working label Apr 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

1 participant