ci: fix branch creation and mergify file #4391
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request does not have a backport label. Could you fix it @v1v? 🙏
|
mergify
bot
added
the
backport-skip
v1v
commented
Oct 17, 2024
| echo ' - "backport"' >> ../.mergify.yml | ||
| echo ' branches:' >> ../.mergify.yml | ||
| echo ' - "$(PROJECT_MAJOR_VERSION).$(PROJECT_MINOR_VERSION)"' >> ../.mergify.yml | ||
| echo ' conditions:' >> ../.mergify.yml |
There was a problem hiding this comment.
only a cosmetic change and the fix in L44
| echo ' title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"' >> ../.mergify.yml | ||
|
|
||
| ## @help:prepare-major-minor-release:Prepare a major/minor release by creating a new branch reference. | ||
| .PHONY: prepare-major-minor-release | ||
| prepare-major-minor-release: | ||
| git checkout 8.x |
There was a problem hiding this comment.
we release from 8.x now, so it's required to checkout 8.x so we can create the branch from
| @@ -68,6 +69,7 @@ create-branch-major-minor-release: | |||
| ## @help:prepare-next-release:Prepare the original branch for the next release cycle. | |||
| .PHONY: prepare-next-release | |||
| prepare-next-release: | |||
| git checkout main | |||
There was a problem hiding this comment.
need main, mergify uses main only
v1v
commented
Oct 17, 2024
bmorelli25
approved these changes
Oct 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I fixed it partially, but missed that I need to set the branches correctly after. moving to 8.x