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

auto-merge: instant merge after creation [skip ci] #1358

Merged
merged 1 commit into from
Dec 10, 2020

Conversation

pxLi
Copy link
Collaborator

@pxLi pxLi commented Dec 10, 2020

Signed-off-by: Peixin Li pxli@nyu.edu

issue from an auto-merge PR: #1356 (comment)

Signed-off-by: Peixin Li <pxli@nyu.edu>
@pxLi pxLi added the build Related to CI / CD or cleanly building label Dec 10, 2020
@pxLi
Copy link
Collaborator Author

pxLi commented Dec 10, 2020

build

@pxLi pxLi requested a review from jlowe December 10, 2020 01:54
@jlowe
Copy link
Member

jlowe commented Dec 10, 2020

I think removing the 10 second wait (which I never understood the purpose) is a reasonable workaround to reduce the window of opportunity, but the window is still there. I think a better solution is changing the workflow to recognize the merge failed because the SHA changed because new commits were pushed so it can automatically loopback and retry.

So I'm OK with this going in to make it less likely to occur, but I think it could be improved to eliminate this type of error entirely.

@pxLi
Copy link
Collaborator Author

pxLi commented Dec 10, 2020

I think removing the 10 second wait (which I never understood the purpose) is a reasonable workaround to reduce the window of opportunity, but the window is still there. I think a better solution is changing the workflow to recognize the merge failed because the SHA changed because new commits were pushed so it can automatically loopback and retry.

So I'm OK with this going in to make it less likely to occur, but I think it could be improved to eliminate this type of error entirely.

yeah, totally agree. since the github API does not give the specific reason for us to identify detailed merge failures, so we may need to add some custom logic in our code. I just created #1363 for a future fix

@pxLi pxLi merged commit 86dd78b into NVIDIA:branch-0.3 Dec 10, 2020
nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
Signed-off-by: Peixin Li <pxli@nyu.edu>
nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
Signed-off-by: Peixin Li <pxli@nyu.edu>
tgravescs pushed a commit to tgravescs/spark-rapids that referenced this pull request Nov 30, 2023
…IDIA#1358)

Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
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