Skip to content

CI: Make merge ref grabbing conditional on the PR being active - #17525

Merged
charris merged 3 commits into
numpy:masterfrom
rossbar:circleci_envvar_fix
Oct 9, 2020
Merged

charris merged 3 commits into
numpy:masterfrom
rossbar:circleci_envvar_fix

Conversation

@rossbar

@rossbar rossbar commented Oct 9, 2020

Copy link
Copy Markdown
Contributor

An attempt to fix #17524 . Only attempt to pull from refs/pull/XXXXX/merge while the PR is still active. This fix is based on the hypothesis that CI_PULL_REQUEST is not set after a PR has been merged.

@mattip does this seem like it's on the right track?

Only attempt to pull from refs/pull/xxxx/merge when pr is still
active.
@mattip

mattip commented Oct 9, 2020

Copy link
Copy Markdown
Member

Yes, that seems like the correct hypothesis

@charris
charris merged commit 60e1319 into numpy:master Oct 9, 2020
@charris

charris commented Oct 9, 2020

Copy link
Copy Markdown
Member

CircleCI works again, that is enough to merge this.

@charris

charris commented Oct 9, 2020

Copy link
Copy Markdown
Member

Thanks Ross.

@charris

charris commented Oct 10, 2020

Copy link
Copy Markdown
Member

This seems to have broken testing for merges to the master branch.

@rossbar

rossbar commented Oct 10, 2020

Copy link
Copy Markdown
Contributor Author

I should've had this marked as WIP - I was hoping to test it on my own fork last evening but circleci itself was acting up and I never had a chance to. So it looks like this didn't fix the original problem. I'm traveling today but should be able to look at it again tomorrow. In the mean time, devdoc deployment could be fixed by either 1) commenting out this run step or 2) reverting #17485.

@charris

charris commented Oct 10, 2020

Copy link
Copy Markdown
Member

No rush. It only bothers me because I get notifications on merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CI: CircleCI build workflow failing

3 participants