Skip to content

CI Fixes CI sync #18695

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
Merged
merged 1 commit into from
Oct 28, 2020
Merged

CI Fixes CI sync #18695

merged 1 commit into from
Oct 28, 2020

Conversation

thomasjpfan
Copy link
Member

@thomasjpfan thomasjpfan commented Oct 28, 2020 •
edited
Loading

This should fix the ci sync label issue seen in #18652

( think it is the detached head that does not allow for the merge.)

Also, it seems the git fetch command fetches way too much, it could just fetch the master branch and only shallow.

@adrinjalali I couldn't think of a way to use https://github.com/actions/checkout#usage to fetch "just enough" such that git merge can find the common ancestor.

@thomasjpfan
Copy link
Member Author

I tested this version of CI sync here with a PR to my fork here: #18650

where it failed it failed here: #18650

adrinjalali
adrinjalali approved these changes Oct 28, 2020
View reviewed changes
Copy link
Member

@adrinjalali adrinjalali left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hopefully this works.

@adrinjalali adrinjalali merged commit 12f1521 into scikit-learn:master Oct 28, 2020
@thomasjpfan thomasjpfan mentioned this pull request Oct 28, 2020
Merged
This was referenced Dec 1, 2020
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrinjalali adrinjalali adrinjalali approved these changes

Assignees
No one assigned
Labels
Build / CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thomasjpfan @adrinjalali