Update branches for new master-next scheme. #7427
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Combine the "next" and "next-upstream" checkout schemes since the new approach for maintaining master-next is to building against the "upstream-with-swift" Clang/LLVM branches. We do not plan to use the "stable-next" branches anymore. (We can delete those branches after this transition has had time to settle out.) I have also merged the "upstream" scheme with "next-upstream" because building the combination of branches previously in the scheme is not something we expect to work now.
|
@gottesmm Can you review this? |
|
LGTM! I would just talk with Mishal about removing the preview branches. @shahmishal How does that part look to you? |
|
@swift-ci Please smoke test |
|
Thanks. (The smoke tests don't exercise this script, do they?) |
|
@bob-wilson While they do not exercise this specific scheme, they will make sure that normal usage still works [which is what I was trying to test = )] |
|
LGTM. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.