Skip to content

Backport PR #9277 on branch v2.1.x #9283

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

Merged
merged 1 commit into from
Oct 7, 2017
Merged

Conversation

lumberbot-app[bot]
Copy link

@lumberbot-app lumberbot-app bot commented Oct 5, 2017

Backport PR #9277: plot_surface docstring + edge case fix

@lumberbot-app lumberbot-app bot added this to the 2.1.1 (next bug fix release) milestone Oct 5, 2017
@QuLogic
Copy link
Member

QuLogic commented Oct 5, 2017

A downside of @meeseeksdev opening branches on the repo here is that both PRs and the branch get run through CI. This is usually fine (though suboptimal) for Travis and Circle, but really slows down AppVeyor since it doesn't run in parallel.

@tacaswell
Copy link
Member

Is there a way to convince appevyor to only run a limited set of branches?

Doing the PRs from this repo is limitation of the github API (the bot can not own a repo to open the PR from).

@tacaswell
Copy link
Member

maybe the commit message for the backport just needs to include [skip ci] ?

attn @Carreau

@QuLogic
Copy link
Member

QuLogic commented Oct 5, 2017

I think it'd be skipped on the PR as well then. We can set exclusive branches, but just need to be careful that it doesn't also exclude the PRs too.

@Carreau
Copy link
Contributor

Carreau commented Oct 5, 2017

Sorry about that, one of the limitation of using GitHub integration is they don't have their own user and can't push on a separate repo. It might be possible to hack something together by creating a fake user on GitHub, but that might be painful to maintain.

I can add skip-ci, but yes that would skip the PR testing. Does appveyor have env variable that tell you which branch it's testing, if we can't completely skip, we could just abort manually if the branch name start with auto-backport-... and if the head commit is not a merge commit ?

@anntzer
Copy link
Contributor

anntzer commented Oct 5, 2017

Carreau added a commit to Carreau/matplotlib that referenced this pull request Oct 5, 2017
This should prevent the automatic backports to be tested both when the
branch is pushed by the backport bot, and when the PR is opened.

Hopefully the PR will be still be tested (that's unclear from the
AppVeyor docs).

This was discussed in
matplotlib#9283 (comment)

And likely need to be also applied to other CI, but Appveyor is the most
annoying.
@dstansby dstansby merged commit 0493add into v2.1.x Oct 7, 2017
@dstansby dstansby deleted the auto-backport-of-pr-9277 branch October 7, 2017 15:29
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.

6 participants