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

Check if the checkout has been --clone'd yet #12856

Merged
merged 4 commits into from Nov 13, 2017

Conversation

Projects
None yet
4 participants
@alper
Contributor

alper commented Nov 10, 2017

As requested in SR-6312 a simple diagnostic to catch the error of not passing --clone the first time you run update-checkout. Checks whether there is just one directory (i.e. the swift/ directory) in SWIFT_SOURCE_ROOT and prints a message.

Resolves SR-6312

This doesn't touch Swift itself, so I'm not sure whether it requires a CI test.

@jrose-apple

This comment has been minimized.

Show comment
Hide comment
@jrose-apple

jrose-apple Nov 10, 2017

Member

Thanks, Alper! I think some people are checking out swift/ into a shared directory, so I'd rather check for, say, cmark/, llvm/, and clang/ specifically—if you have any of those, you probably know what you're doing. What do you think?

(And yeah, technically this shouldn't need pre-merge testing but it's a blanket requirement on all PRs.)

Member

jrose-apple commented Nov 10, 2017

Thanks, Alper! I think some people are checking out swift/ into a shared directory, so I'd rather check for, say, cmark/, llvm/, and clang/ specifically—if you have any of those, you probably know what you're doing. What do you think?

(And yeah, technically this shouldn't need pre-merge testing but it's a blanket requirement on all PRs.)

@alper

This comment has been minimized.

Show comment
Hide comment
@alper

alper Nov 10, 2017

Contributor

You're right. If they have any of those, they probably don't need to see that message.

This should be it. Let me know if I need to do anything else.

Contributor

alper commented Nov 10, 2017

You're right. If they have any of those, they probably don't need to see that message.

This should be it. Let me know if I need to do anything else.

@jrose-apple

This comment has been minimized.

Show comment
Hide comment
@jrose-apple

jrose-apple Nov 10, 2017

Member

Looks good to me!

@swift-ci Please smoke test and merge

Member

jrose-apple commented Nov 10, 2017

Looks good to me!

@swift-ci Please smoke test and merge

@jrose-apple jrose-apple self-assigned this Nov 10, 2017

@CodaFi

This comment has been minimized.

Show comment
Hide comment
@CodaFi

CodaFi Nov 10, 2017

Collaborator

@swift-ci Please smoke test and merge

Collaborator

CodaFi commented Nov 10, 2017

@swift-ci Please smoke test and merge

2 similar comments
@jrose-apple

This comment has been minimized.

Show comment
Hide comment
@jrose-apple

jrose-apple Nov 10, 2017

Member

@swift-ci Please smoke test and merge

Member

jrose-apple commented Nov 10, 2017

@swift-ci Please smoke test and merge

@shahmishal

This comment has been minimized.

Show comment
Hide comment
@shahmishal

shahmishal Nov 11, 2017

Member

@swift-ci Please smoke test and merge

Member

shahmishal commented Nov 11, 2017

@swift-ci Please smoke test and merge

alper added some commits Nov 10, 2017

Check if the checkout has been --clone'd yet
As requested in SR-6312 a simple diagnostic to catch the error of not passing --clone the first time you run update-checkout. Checks whether there is just one directory (i.e. the swift/ directory) in SWIFT_SOURCE_ROOT and prints a message.
@alper

This comment has been minimized.

Show comment
Hide comment
@alper

alper Nov 11, 2017

Contributor

Merge didn't work for some reason (405 base branch was modified). I rebased off master and pushed this branch again. Should work now I hope.

Contributor

alper commented Nov 11, 2017

Merge didn't work for some reason (405 base branch was modified). I rebased off master and pushed this branch again. Should work now I hope.

@CodaFi

This comment has been minimized.

Show comment
Hide comment
@CodaFi

CodaFi Nov 11, 2017

Collaborator

@swift-ci please smoke test

Collaborator

CodaFi commented Nov 11, 2017

@swift-ci please smoke test

@jrose-apple jrose-apple merged commit 4a97c4b into apple:master Nov 13, 2017

2 checks passed

Swift Test Linux Platform (smoke test)
Details
Swift Test OS X Platform (smoke test)
Details
@jrose-apple

This comment has been minimized.

Show comment
Hide comment
@jrose-apple

jrose-apple Nov 13, 2017

Member

Got it finally. Thanks, Alper!

Member

jrose-apple commented Nov 13, 2017

Got it finally. Thanks, Alper!

@alper alper deleted the alper:patch-1 branch Nov 13, 2017

@alper

This comment has been minimized.

Show comment
Hide comment
@alper

alper Nov 13, 2017

Contributor

Awesome! Thank you too.

Contributor

alper commented Nov 13, 2017

Awesome! Thank you too.

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