<rdar://problem/29565695> use gated merges from LLVM swift-*-branch to stable
> On Jan 31, 2017, at 1:20 PM, Frédéric Riss <fr...@apple.com> wrote: > > >> On Jan 31, 2017, at 1:17 PM, Michael Ilseman <milse...@apple.com >> <mailto:milse...@apple.com>> wrote: >> >> Thanks, could you file a radar with the details? > > I’m pretty sure there’s already one lying around. +Michael G, +Bob with whom > this was discussed in the past (this is about gating merges > swift-x.x-branch->stable on some kind of automatic PR testing). > > Fred > >> >> >>> On Jan 31, 2017, at 12:54 PM, Frédéric Riss <fr...@apple.com >>> <mailto:fr...@apple.com>> wrote: >>> >>> >>>> On Jan 31, 2017, at 12:03 PM, Michael Ilseman <milse...@apple.com >>>> <mailto:milse...@apple.com>> wrote: >>>> >>>> Fred, do you know why this wasn’t caught by PR testing? >>> >>> This commit went to the clang stable branch. There’s no PR testing there. >>> I’ve been sloppy, the change was so simple that I decided no to test it. Of >>> course I typoed. >>> >>> The plan was to get merges from swift-x.x-branch -> stable merges on some >>> kind of automates PR testing. This would have prevented my sloppiness from >>> breaking Swift. This really needs to be implemented. >>> >>> Fred >>> >>>> >>>>> On Jan 31, 2017, at 11:16 AM, Michael Ilseman <milse...@apple.com >>>>> <mailto:milse...@apple.com>> wrote: >>>>> >>>>> Thank you! >>>>> >>>>>> On Jan 31, 2017, at 11:15 AM, Frédéric Riss <fr...@apple.com >>>>>> <mailto:fr...@apple.com>> wrote: >>>>>> >>>>>> Yes, I already pushed a fix. Sorry about that. >>>>>> >>>>>> Fred >>>>>> >>>>>>> On Jan 31, 2017, at 11:13 AM, Michael Ilseman <milse...@apple.com >>>>>>> <mailto:milse...@apple.com>> wrote: >>>>>>> >>>>>>> Fred, probably you? >>>>>>> >>>>>>> CMake Error at tools/clang/tools/driver/CMakeLists.txt:79 (set): >>>>>>> Syntax error in cmake code at >>>>>>> >>>>>>> >>>>>>> /Users/buildnode/jenkins/workspace/oss-lldb-swift-3.1-incremental-osx/llvm/tools/clang/tools/driver/CMakeLists.txt:79 >>>>>>> >>>>>>> when parsing string >>>>>>> >>>>>>> ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH >>>>>>> >>>>>>> There is an unterminated variable reference. >>>>>>> >>>>>>> >>>>>>> -- Configuring incomplete, errors occurred! >>>>>>> See also >>>>>>> "/Users/buildnode/jenkins/workspace/oss-lldb-swift-3.1-incremental-osx/Ninja-ReleaseAssert/llvm-macosx-x86_64/CMakeFiles/CMakeOutput.log". >>>>>>> See also >>>>>>> "/Users/buildnode/jenkins/workspace/oss-lldb-swift-3.1-incremental-osx/Ninja-ReleaseAssert/llvm-macosx-x86_64/CMakeFiles/CMakeError.log". >>>>>>> FAILED: build.ninja >>>>>>> /Applications/CMake.app/Contents/bin/cmake >>>>>>> -H/Users/buildnode/jenkins/workspace/oss-lldb-swift-3.1-incremental-osx/llvm >>>>>>> >>>>>>> -B/Users/buildnode/jenkins/workspace/oss-lldb-swift-3.1-incremental-osx/Ninja-ReleaseAssert/llvm-macosx-x86_64 >>>>>>> <> >>>>>>> >>>>>>> >>>>>>> >>>>>>>> On Jan 31, 2017, at 10:50 AM, no-re...@swift.org >>>>>>>> <mailto:no-re...@swift.org> wrote: >>>>>>>> >>>>>>>> [FAILURE] oss-lldb-swift-3.1-incremental-osx [#187] >>>>>>>> >>>>>>>> Build URL: >>>>>>>> https://ci.swift.org/job/oss-lldb-swift-3.1-incremental-osx/187/ >>>>>>>> <https://ci.swift.org/job/oss-lldb-swift-3.1-incremental-osx/187/> >>>>>>>> Project: oss-lldb-swift-3.1-incremental-osx >>>>>>>> Date of build: Tue, 31 Jan 2017 10:50:27 -0800 >>>>>>>> Build duration: 26 sec >>>>>>>> Identified problems: >>>>>>>> >>>>>>>> Compile Error: This build failed because of a compile error. Below is >>>>>>>> a list of all errors in the build log: >>>>>>>> Indication 1 >>>>>>>> <https://ci.swift.org//job/oss-lldb-swift-3.1-incremental-osx/187/consoleFull#3542627ee1a197b-acac-4b17-83cf-a53b95139a76> >>>>>>>> Changes >>>>>>>> >>>>>>>> Commit e4215eb1b07ed69909b001216f83d51f743ef82b by friss: >>>>>>>> [CMake] Fixing variable names that were mistyped >>>>>>>> >>>>>>>> edit: tools/driver/CMakeLists.txt >>>>>>>> >>>>>>>> Commit d82b06d6ee1bebd4ed371fb08efd852c15071d5e by friss: >>>>>>>> Add the patch version to the embedded Info.plist. >>>>>>>> >>>>>>>> edit: tools/driver/CMakeLists.txt >>>>>>> >>>>>> >>>>> >>>> >>> >> >
_______________________________________________ swift-dev mailing list swift-dev@swift.org https://lists.swift.org/mailman/listinfo/swift-dev
