Skip to content

Bump the compiler version to 4.2 (and 3.4) #13767

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

Merged
merged 1 commit into from
Mar 3, 2018

Conversation

jrose-apple
Copy link
Contributor

Whether there's going to be an actual 4.2 release or we go straight to 5.0, we're not 4.1 anymore.

@jrose-apple
Copy link
Contributor Author

cc @aciidb0mb3r

@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

@aciidgh
Copy link
Contributor

aciidgh commented Jan 6, 2018

Thanks Jordan!

@swift-ci
Copy link
Contributor

swift-ci commented Jan 6, 2018

Build failed
Swift Test OS X Platform
Git Sha - 95705b7cee87e1cb51da54da27aa7e123e420a1f

@bob-wilson
Copy link
Contributor

This looks OK to me. Should we just go straight to 5.0 now?

@jrose-apple
Copy link
Contributor Author

Bah, missed a test. Uh, it's probably okay to go straight to 5 but I wonder at what point we're going to discuss the testing strategy. (The tests are mostly still run in Swift 3 mode unless specified otherwise because they were a corpus of Swift 3 code.)

@jrose-apple
Copy link
Contributor Author

There's also "get the compiler to advertise itself as Swift 5" vs. "change the default when you omit -swift-version" and those don't have to be in sync…but it makes more sense when they are.

Whether there's going to be an actual 4.2 release or we go straight to
5.0, we're not 4.1 anymore.
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

@swift-ci
Copy link
Contributor

swift-ci commented Jan 6, 2018

Build failed
Swift Test OS X Platform
Git Sha - 95705b7cee87e1cb51da54da27aa7e123e420a1f

@swift-ci
Copy link
Contributor

swift-ci commented Jan 6, 2018

Build failed
Swift Test Linux Platform
Git Sha - 95705b7cee87e1cb51da54da27aa7e123e420a1f

@jrose-apple
Copy link
Contributor Author

Since #13843 didn't quite go cleanly and I haven't had time to look at it, can we merge this in the mean time?

@jrose-apple
Copy link
Contributor Author

@swift-ci Please smoke test

@jrose-apple jrose-apple removed the request for review from ematejska January 30, 2018 17:18
@@ -40,7 +40,7 @@
CMAKE_GENERATOR = 'Ninja'

COMPILER_VENDOR = 'none'
SWIFT_USER_VISIBLE_VERSION = CompilerVersion('4.1')
SWIFT_USER_VISIBLE_VERSION = CompilerVersion('4.2')
CLANG_USER_VISIBLE_VERSION = CompilerVersion('5.0.0')
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This default is very suspicious. Shouldn't we be getting it from the Clang repository somehow? cc @Rostepher

@jrose-apple
Copy link
Contributor Author

Per https://swift.org/blog/4-2-release-process/, this is the right one to commit now, right @tkremenek?

@swift-ci Please smoke test

@tkremenek
Copy link
Member

Yes

@jrose-apple jrose-apple merged commit a16d8a7 into swiftlang:master Mar 3, 2018
@jrose-apple jrose-apple deleted the swift-4.2 branch March 3, 2018 02:09
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.

5 participants