Skip to content

Auto PR Build fails when branch force pushed #6097

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

Closed
pllim opened this issue Aug 22, 2019 · 6 comments
Closed

Auto PR Build fails when branch force pushed #6097

pllim opened this issue Aug 22, 2019 · 6 comments
Labels
Bug A bug

Comments

@pllim
Copy link
Contributor

pllim commented Aug 22, 2019

Details

xref spacetelescope/synphot_refactor#214

Expected Result

Successful build and a green check.

Actual Result

Error in build and the check got stuck in the yellow "pending" purgatory.

Read the Docs build information
Build id: 9552745
Project: synphot
Version: 214
Commit: e5c62052eb18eccd8c3b2ba9154fc7d841d42aa9
Date: 2019-08-22T20:05:54.195292Z
State: finished
Success: False

[rtd-command-info] start-time: 2019-08-22T20:05:54.611830Z, end-time: 2019-08-22T20:05:54.621555Z, duration: 0, exit-code: 0
git remote set-url origin https://github.com/spacetelescope/synphot_refactor

[rtd-command-info] start-time: 2019-08-22T20:05:54.724120Z, end-time: 2019-08-22T20:05:55.276842Z, duration: 0, exit-code: 1
git fetch origin --tags --prune --prune-tags --depth 50 pull/214/head:external-214
From https://github.com/spacetelescope/synphot_refactor
 ! [rejected]        refs/pull/214/head -> external-214  (non-fast-forward)

Screenshot from 2019-08-22 16-46-58

@stsewd stsewd added the Bug A bug label Aug 22, 2019
@stsewd
Copy link
Member

stsewd commented Aug 22, 2019

Looks like we can't do a fetch when a commit was rebased, we need to do a clone instead.

@stsewd
Copy link
Member

stsewd commented Aug 23, 2019

I just tested this, the payload from the pull request doesn't include if the sync was done with a forced push.

We are testing always doing a clone #5680, but not sure if it would be released. Another option is to force a clone for the PR versions.

@ericholscher
Copy link
Member

Hrm, I imagine this is also an issue with normal branches that are force-pushed. So perhaps we need to pass some flag to git to allow non-fast-forward updates?

@pllim
Copy link
Contributor Author

pllim commented Aug 23, 2019

Maybe git fetch -f ... would work? 🤷‍♀

https://git-scm.com/docs/git-fetch

@saadmk11
Copy link
Member

I'm closing this as the PR regarding this is merged. :)

@pllim
Copy link
Contributor Author

pllim commented Aug 28, 2019

Works for me now; thanks for reviewing and merging my patch! 😸

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug A bug
Projects
None yet
Development

No branches or pull requests

4 participants