Skip to content

Conversation

@davezarzycki
Copy link

No description provided.

@davezarzycki
Copy link
Author

@swift-ci please smoke test platform

@davezarzycki davezarzycki changed the base branch from swift/master to apple/master November 19, 2019 14:21
@davezarzycki
Copy link
Author

@swift-ci please smoke test platform

@davezarzycki
Copy link
Author

Okay, I think I did everything correctly. APINotes is an Apple only thing. I'm not sure why Apple's version of clang's Index library is different.

Do we not support CI testing for apple/master?

compnerd
compnerd previously approved these changes Nov 19, 2019
@compnerd
Copy link
Member

I think that this should be submitted to apple/stable/20190619

@compnerd compnerd dismissed their stale review November 19, 2019 16:28

wrong branch

@davezarzycki
Copy link
Author

davezarzycki commented Nov 19, 2019

I'm still confused about Apple's branch scheme. Why is this change wrong for apple/master? Why apple/stable/20190619 and not apple/stable/20191106?

EDIT – And why did you mark this pull request as being approved when the comments suggest otherwise?

@nathawes nathawes requested review from jkorous-apple and removed request for nathawes November 19, 2019 23:43
@jkorous-apple jkorous-apple requested a review from hyp November 19, 2019 23:47
@compnerd
Copy link
Member

@davezarzycki - you are asking the right questions! I feel the same way. My understanding, which I admit may be incorrect, is: the current swift/master branch is an integration branch based on apple/stable/20190619. Changes are applied to that branch, go through testing and if everything passes, gets merged into swift/master. The apple/master branch is tracking llvm/master I believe.

As to the incorrect marking - that was a side effect of not being fully awake, sorry about the confusion.

@hyp
Copy link

hyp commented Nov 20, 2019

@davezarzycki It looks like this needs to be submitted to both apple/master (that merges into swift/master-next, and thus is important for Swift's master-next branch), and then cherry-picked to apple/stable/20190619 (that merges into swift/master, and thus is need for Swift's master branch). Is our branching guide document helpful:
https://github.com/apple/llvm-project/blob/apple/master/apple-docs/AppleBranchingScheme.md
?

Copy link

@hyp hyp left a comment

Choose a reason for hiding this comment

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

LGTM. Please cherry-pick to apple/stable/20190619 as well.

@davezarzycki davezarzycki merged commit fcb9464 into swiftlang:apple/master Nov 21, 2019
@davezarzycki davezarzycki deleted the fix_build_shared_libs branch November 21, 2019 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants