8000 Circle doesn't merge with master · Issue #8058 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

Circle doesn't merge with master #8058

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.

Sign up for GitHub

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

Jump to bottom
Closed
jnothman opened this issue Dec 15, 2016 · 9 comments
Closed

Circle doesn't merge with master #8058

jnothman opened this issue Dec 15, 2016 · 9 comments
Labels
Build / CI

Comments

@jnothman
Copy link
Member

It seems that if a PR is based on an old copy of master, CircleCI will still run the build script from the old master (which triggers the sphinx/gallery incompatibility which was fixed in master since). Should we be merging in master before building a PR on Circle?
@tguillemot tguillemot mentioned this issue Dec 16, 2016
Merged
@amueller
Copy link
Member

sounds good

@lesteve
Copy link
Member
lesteve commented Dec 18, 2016

It seems that if a PR is based on an old copy of master, CircleCI will still run the build script from the old master

CircleCI runs on the PR branch on the fork not on the result of the merge of the PR into master (the latter is what we are used to from Travis).

I noticed the other day that conda-forge had some code to do this:
https://github.com/conda-forge/staged-recipes/blob/master/scripts/checkout_merge_commit.sh

@jnothman
Copy link
Member Author
jnothman commented Dec 20, 2016 via email •
edited
Loading

@jnothman
Copy link
Member Author

@jakirkham would you mind re-contributing conda-forge/staged-recipes#1486 here?

@jnothman jnothman mentioned this issue Jan 17, 2017
Merged
@jnothman
Copy link
Member Author

I suppose without @jakirkham's permission we can copy that code and attach a conda-forge copyright :\

@jakirkham
Copy link
Contributor

Sorry, this must have gotten buried. I'm more than happy to contribute this. TBH I can probably put it and some sample code in a repo and throw CC0 text in there for good measure if this is of interest to other projects.

@jnothman
Copy link
Member Author
jnothman commented Jan 18, 2017 via email

@jakirkham jakirkham mentioned this issue Jan 18, 2017
Merged
@jakirkham
Copy link
Contributor

Have added PR ( #8211 ) to scikit-learn, which includes this functionality.

@jnothman
Copy link
Member Author
jnothman commented Jan 18, 2017 via email

@jakirkham jakirkham mentioned this issue Feb 5, 2017
Closed
@bsipocz bsipocz mentioned this issue Feb 24, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Build / CI
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@jnothman @amueller @lesteve @jakirkham
0