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

Maybe set base branch #20

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Maybe set base branch #20

wants to merge 5 commits into from

Conversation

oliverholworthy
Copy link
Member

@oliverholworthy oliverholworthy commented Jun 14, 2023

Extend the check-base-branch.yaml workflow 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

permissions: 
  pull_request: write

@oliverholworthy oliverholworthy added the enhancement New feature or request label Jun 14, 2023
@oliverholworthy oliverholworthy self-assigned this Jun 14, 2023
@oliverholworthy oliverholworthy marked this pull request as draft June 14, 2023 14:29
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. "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this include instructions for what to do in that case?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants