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

Add workflow for backporting PRs #4912

Merged
merged 2 commits into from
May 28, 2023

Conversation

SchrodingersGat
Copy link
Member

  • Time saving for backporting bug fixes to stable branches
  • Apply to PRs before closing

Uses the backport-action github action.

- Time saving for backporting bug fixes to stable branches
- Apply to PRs before closing
@SchrodingersGat SchrodingersGat added CI CI / unit testing ecosystem backport Apply this label to a PR to enable auto-backport action backport-to-0.11.x labels May 27, 2023
@SchrodingersGat
Copy link
Member Author

@matmair LMK what you think of this. Making the backporting process easier will mean we can merge bug fixes in and quickly patch to the stable branch too

@wolflu05
Copy link
Contributor

How does this work with solving merge conflicts?

@SchrodingersGat
Copy link
Member Author

I think if there are merge conflicts it will error out and we'd have to do it manually anyway

@SchrodingersGat
Copy link
Member Author

Closing this out, as I have discoverd that the automatic release notes only work with PRs, not commits. So back-porting like this will not generate any release notes for bugfix releases.

I will have to continue to manually cherry-pick each bug fix onto the stable branch and create a duplicate PR, in order to get the automated release notes

@SchrodingersGat SchrodingersGat deleted the backport-action branch May 27, 2023 13:28
@wolflu05
Copy link
Contributor

@SchrodingersGat Why not letting this bot create the prs?

@SchrodingersGat SchrodingersGat restored the backport-action branch May 27, 2023 22:18
@SchrodingersGat
Copy link
Member Author

@wolflu05 I misread the docs for this workflow and thought it would merge directly into the target branch, but reading the docs correctly I see it will actually create a PR. So,.let's give it a go.

@SchrodingersGat SchrodingersGat merged commit 60f79a0 into inventree:master May 28, 2023
21 checks passed
@SchrodingersGat SchrodingersGat deleted the backport-action branch May 28, 2023 08:55
github-actions bot pushed a commit that referenced this pull request May 28, 2023
* Add workflow for backporting PRs

- Time saving for backporting bug fixes to stable branches
- Apply to PRs before closing

* Cleanup .json file

(cherry picked from commit 60f79a0)
@github-actions
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
0.11.x

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Apply this label to a PR to enable auto-backport action CI CI / unit testing ecosystem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants