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

refactor automerge to support merge for protected branch #668

Merged
merged 6 commits into from
Sep 9, 2020

Conversation

pxLi
Copy link
Collaborator

@pxLi pxLi commented Sep 4, 2020

Previous auto-merge workflow only works for auto-merge into an unprotected branch, as how cudf's automerge does.
But this is not reasonable when we switch branch-0.3 as default branch, so I added auto-approve for this automation workflow, and it will try approving auto-merged pr if possible.

demo PR: pxLi#153

NOTE: a new secret NVAUTO_TOKEN has to be added to repo since github requires a different account to approve the PR. nvauto is our automation account which has already been invited to spark-rapids repo.

@pxLi
Copy link
Collaborator Author

pxLi commented Sep 4, 2020

build

@pxLi pxLi requested review from sameerz and jlowe September 4, 2020 03:55
@pxLi pxLi added the build Related to CI / CD or cleanly building label Sep 4, 2020
@pxLi
Copy link
Collaborator Author

pxLi commented Sep 4, 2020

build

3 similar comments
@pxLi
Copy link
Collaborator Author

pxLi commented Sep 4, 2020

build

@pxLi
Copy link
Collaborator Author

pxLi commented Sep 4, 2020

build

@pxLi
Copy link
Collaborator Author

pxLi commented Sep 4, 2020

build

@jlowe
Copy link
Member

jlowe commented Sep 4, 2020

only works for auto-merge into an unprotected branch, as how cudf's automerge does

Is that really the case? I find it very surprising that cudf's repo would leave the new development branch unprotected. Also my personal experience with cudf during auto-merge periods is that the new branch still requires CI checks and approvals before developers can merge to the branch, yet GPUtester can still merge the PRs without approval.

@pxLi
Copy link
Collaborator Author

pxLi commented Sep 6, 2020

only works for auto-merge into an unprotected branch, as how cudf's automerge does

Is that really the case? I find it very surprising that cudf's repo would leave the new development branch unprotected. Also my personal experience with cudf during auto-merge periods is that the new branch still requires CI checks and approvals before developers can merge to the branch, yet GPUtester can still merge the PRs without approval.

yeah, they keep the CI check but added the [skip ci] thing for auto-merge scenario to pass the CI checks. I did the same thing for our new blossom-ci pipeline PR #642

@pxLi
Copy link
Collaborator Author

pxLi commented Sep 9, 2020

build

@pxLi
Copy link
Collaborator Author

pxLi commented Sep 9, 2020

build

@pxLi pxLi merged commit 14c5610 into NVIDIA:branch-0.2 Sep 9, 2020
nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
* support auto-merge on protected branch

Signed-off-by: Peixin Li <pxli@nyu.edu>
nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
* support auto-merge on protected branch

Signed-off-by: Peixin Li <pxli@nyu.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants