search

Hyperfoil / horreum-client-python

Python library and examples for Horreum
Apache License 2.0
0 stars 2 forks source link

Keep Horreum branch fixed while backporting #12

Open lampajr opened 6 months ago

lampajr commented 6 months ago

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: https://github.com/Hyperfoil/horreum-client-python/pull/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.