chore(mergify): release-* branches require release manager approval #567
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
The mergify config currently doesn't distinguish between merging to master and merging to a release branch. It currently never merges to release branches because mergify doesn't have permission to merge to these branches (due to branch protection rules). I don't want to give mergify that permission without updating the config file here, as then it would merge to release branches after any approval, whereas we only want to merge to release branches if a PR is approved by a release manager. This updates the mergify config to scope the existing rules to only apply to the master branch, and adds a new rule to merge to release branches upon approval by a release manager. Because the 1.17 branch (and likely the 1.18 branch in some repos) is still exclusively using Travis CI instead of github actions, also add a rule the merges if Travis CI passes to account for these branches. This rule can be deleted once all of the active branches in the repo are using Github actions.
plumpy
approved these changes
Mar 25, 2020
opsmxdemo
pushed a commit
to OpsMx/rosco
that referenced
this pull request
Sep 15, 2020
…pinnaker#567) The mergify config currently doesn't distinguish between merging to master and merging to a release branch. It currently never merges to release branches because mergify doesn't have permission to merge to these branches (due to branch protection rules). I don't want to give mergify that permission without updating the config file here, as then it would merge to release branches after any approval, whereas we only want to merge to release branches if a PR is approved by a release manager. This updates the mergify config to scope the existing rules to only apply to the master branch, and adds a new rule to merge to release branches upon approval by a release manager. Because the 1.17 branch (and likely the 1.18 branch in some repos) is still exclusively using Travis CI instead of github actions, also add a rule the merges if Travis CI passes to account for these branches. This rule can be deleted once all of the active branches in the repo are using Github actions.
opsmxdemo
pushed a commit
to OpsMx/rosco
that referenced
this pull request
Sep 16, 2020
…pinnaker#567) The mergify config currently doesn't distinguish between merging to master and merging to a release branch. It currently never merges to release branches because mergify doesn't have permission to merge to these branches (due to branch protection rules). I don't want to give mergify that permission without updating the config file here, as then it would merge to release branches after any approval, whereas we only want to merge to release branches if a PR is approved by a release manager. This updates the mergify config to scope the existing rules to only apply to the master branch, and adds a new rule to merge to release branches upon approval by a release manager. Because the 1.17 branch (and likely the 1.18 branch in some repos) is still exclusively using Travis CI instead of github actions, also add a rule the merges if Travis CI passes to account for these branches. This rule can be deleted once all of the active branches in the repo are using Github actions.
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.
The mergify config currently doesn't distinguish between merging to master and
merging to a release branch. It currently never merges to release branches
because mergify doesn't have permission to merge to these branches (due to
branch protection rules).
I don't want to give mergify that permission without updating the config file
here, as then it would merge to release branches after any approval, whereas we
only want to merge to release branches if a PR is approved by a release manager.
This updates the mergify config to scope the existing rules to only apply to
the master branch, and adds a new rule to merge to release branches upon
approval by a release manager.
Because the 1.17 branch (and likely the 1.18 branch in some repos) is still
exclusively using Travis CI instead of github actions, also add a rule the
merges if Travis CI passes to account for these branches. This rule can be
deleted once all of the active branches in the repo are using Github actions.