[swift-dev] Stable Merge later this week

[Michael Gottesman]

I.e. make sure to update your llvm/clang now.

Michael

> On Feb 7, 2016, at 5:58 AM, Michael Gottesman via swift-dev <swift-dev at swift.org> wrote:
> 
> Its landed. I am going to baby sit the bots for a little bit.
> 
> Michael
> 
>> On Feb 6, 2016, at 7:05 PM, Michael Gottesman via swift-dev <swift-dev at swift.org> wrote:
>> 
>> An update:
>> 
>> We ran into delays since commits committed since I last did the incremental merge last Wednesday conflicted with the stable merge, but those are fixed now. I am now performing the last test run on the CI.. It is going to take a little bit. Then I am going to land this.
>> 
>> Please be careful with what you commit.
>> 
>> Thank you for your patience,
>> Michael
>> 
>>> On Feb 6, 2016, at 1:48 PM, Michael Gottesman via swift-dev <swift-dev at swift.org> wrote:
>>> 
>>> I am preparing the final swift stable merge today. I will email when it lands.
>>> 
>>> In the mean time please do not cherry-pick anything into the stable llvm/clang repositories. Swift only changes are generally ok.
>>> 
>>> Michael
>>> 
>>>> On Feb 4, 2016, at 12:34 PM, Michael Gottesman via swift-dev <swift-dev at swift.org> wrote:
>>>> 
>>>> This is just a reminder that the stable merge is going to be happening this weekend on Saturday, Feb 6. This date was chosen in order to reduce the churn going on in tree while the merge is occurring.
>>>> 
>>>> I will send out an email on Saturday before I begin the merge.
>>>> 
>>>> Michael
>>>> 
>>>>> On Feb 2, 2016, at 12:23 PM, Michael Gottesman <mgottesman at apple.com> wrote:
>>>>> 
>>>>> Due to the speed at which LLVM/Clang and Swift move, we do not build Swift against ToT LLVM. We tried this in the past and it resulted in us spending a lot of time dealing with upstream churn and not working on swift. To work around this problem, we now build against stable snapshots of LLVM/Clang that are updated as soon as possible given a minimum break of 2-3 weeks in between such updates (1).
>>>>> 
>>>>> Later this week, I will be performing such an update to the stable snapshots of LLVM/Clang. This will involve changes to Swift and LLDB to work with the new LLVM/Clang. I will send out an email the day I perform it as well as right before I perform the operation.
>>>>> 
>>>>> I have verified that these changes work on the current x86_64 OS X/ubuntu builds via the CI system. For those supporting other platforms if one wishes to test against the stable merge before it lands please check out the following branches:
>>>>> 
>>>>> 1. swift-llvm:stable-next
>>>>> 2. swift-clang: stable-next
>>>>> 3. swift:master-next
>>>>> 4. swift-lldb:master-next
>>>>> 
>>>>> Then perform the normal work flow for testing your build.
>>>>> 
>>>>> Thanks,
>>>>> Michael
>>>>> 
>>>>> (1) The reason for mentioning a minimum and not a maximum time is that sometimes it takes longer to perform a merge due to disruptive upstream changes. The minimum cadence is meant to provide some stability even if the upstream changes are not disruptive.
>>>> 
>>>> _______________________________________________
>>>> swift-dev mailing list
>>>> swift-dev at swift.org
>>>> https://lists.swift.org/mailman/listinfo/swift-dev
>>> 
>>> _______________________________________________
>>> swift-dev mailing list
>>> swift-dev at swift.org
>>> https://lists.swift.org/mailman/listinfo/swift-dev
>> 
>> _______________________________________________
>> swift-dev mailing list
>> swift-dev at swift.org
>> https://lists.swift.org/mailman/listinfo/swift-dev
> 
> _______________________________________________
> swift-dev mailing list
> swift-dev at swift.org
> https://lists.swift.org/mailman/listinfo/swift-dev