Skip to content
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

Migrating to Swift 3 #60

Merged
merged 1 commit into from Mar 10, 2016
Merged

Conversation

moiseev
Copy link
Contributor

@moiseev moiseev commented Mar 1, 2016

No description provided.

@modocache
Copy link
Collaborator

This is awesome, thanks @moiseev! Would you mind squashing your commits into one?

@modocache
Copy link
Collaborator

@swift-ci please test

@moiseev
Copy link
Contributor Author

moiseev commented Mar 2, 2016

@modocache Ah... Sorry. Squashed. Rebased.

@mike-ferris
Copy link

@swift-ci please test

@modocache
Copy link
Collaborator

The OS X CI isn't fully operational yet, so don't worry about that one. (I'm talking with @shahmishal about this, expect updates soon!)

The Linux CI appears to fail due to the Swift 3 changes. The failed job ran the following:

/home/buildnode/jenkins/workspace/swift-corelibs-xctest-PR-Linux/swift-corelibs-xctest/build_script.py \
    --swiftc=/home/buildnode/jenkins/workspace/swift-corelibs-xctest-PR-Linux/Ninja-ReleaseAssert/swift-linux-x86_64/bin/swiftc \
    --build-dir=/home/buildnode/jenkins/workspace/swift-corelibs-xctest-PR-Linux/Ninja-ReleaseAssert/xctest-linux-x86_64 \
    --swift-build-dir=/home/buildnode/jenkins/workspace/swift-corelibs-xctest-PR-Linux/Ninja-ReleaseAssert/swift-linux-x86_64 \
    --arch=x86_64

As you can see, it's using the swiftc built from the apple/swift master branch in order to build XCTest--so this should work. @moiseev, any idea why this might be happening? Should Swift 3 syntax work when compiled using apple/swift master right now?

@moiseev
Copy link
Contributor Author

moiseev commented Mar 3, 2016

@modocache No. Swift 3 changes require a Swift 3 compiler (that is in swift-3-api-guidelines branch).

@modocache
Copy link
Collaborator

Aha, gotcha. OK, so we should only merge this once https://github.com/apple/swift/tree/swift-3-api-guidelines is merged into master?

@moiseev
Copy link
Contributor Author

moiseev commented Mar 3, 2016

That would be the right thing to do, yes.

@modocache
Copy link
Collaborator

@moiseev Looking forward to having this merged in the coming days! I wonder if all the new code added in #43 is Swift 3 compliant, though... could you double-check before this is merged?

@moiseev
Copy link
Contributor Author

moiseev commented Mar 9, 2016

I'm checking all the ports now. Will rebase the branch on top of latest master.

Includes both automatic changes made by migrator and manual fixes after
that.
gribozavr added a commit that referenced this pull request Mar 10, 2016
@gribozavr gribozavr merged commit d28cbd6 into apple:master Mar 10, 2016
@modocache
Copy link
Collaborator

Cool, thanks @moiseev! 👍

@moiseev moiseev deleted the swift-3-api-guidelines branch May 16, 2016 20:55
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.

None yet

4 participants