Conversation
karlhigley
reviewed
Jun 16, 2023
| echo "::error::Pull Request base ref must be the development branch: '${{ inputs.development-branch-name }}'. Found base ref: '${{ github.base_ref }}' ." | ||
| echo "If you're sure you need to merge this change into '${{ github.base_ref }}' instead. " | ||
| echo "::error::Pull Request base ref must be the development branch: '${{ inputs.development-branch-name }}'. Found base ref: '${base_ref}' ." | ||
| echo "If you're sure you need to merge this change into '${base_ref}' instead. " |
Contributor
There was a problem hiding this comment.
Should this include instructions for what to do in that case?
Contributor
Author
There was a problem hiding this comment.
the instruction is on the next line 'you can add the label 'skip-base-branch-check' (or do you have something else in mind). Can move that up to the same line if that's clearer?
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Extend the
check-base-branch.yamlworkflow with an extra job that set's the base branch of the pull request if the ref corresponds to the stable branch.This supports changing the default branch of the repos NVIDIA-Merlin/Merlin#866 without creating too much friction when opening new Pull Requests on the stable branch.
Before this maybe set branch job will run sucessfully, we need to update each repo with the required permissions