Dynamically determine the swift compiler version. #8707
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
Prebuilts for macros and the automated downloading of SwiftSDKs need to know the version of the compiler so we can fetch compatible binaries. The swiftc compiler has a --print-target-info options which dumps out a JSON structure that contains the compilerVersion. We already use info in this structure to determine the hostTriple for the UserToolchain. This adds the swiftCompilerVersion to UserToolchain that uses a couple of regex's to pull out the Swift compiler version. This is then used by the prebuilts feature instead of our current hardcodeing of the swift toolchain version. This also turns the prebuilts feature on by default which was supposed to be done in the last update.
dschaefer2
requested review from
jakepetroules,
shawnhyam,
bripeticca,
plemarquand,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
|
@swift-ci please test |
jakepetroules
approved these changes
May 21, 2025
| return nil | ||
| } | ||
|
|
||
| // Extract the swift version using regex from the description if available |
There was a problem hiding this comment.
I'm pretty sure what you have captures the necessary variations, but here is what SwiftBuild is doing for the record: https://github.com/swiftlang/swift-build/blob/8e71bde5ac572174bc7e65f505abf3559bf05455/Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift#L3607
There was a problem hiding this comment.
I'm about to put a patch up for swift-build. It's way too specific right now 😅
There was a problem hiding this comment.
There was a problem hiding this comment.
All the mocks failed. Another commit incoming.
The mocks we use in the tests need to be able to provide their own swift version since the swift compiler path is usually faked out.
|
@swift-ci please test |
|
@swift-ci please test windows |
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.
Prebuilts for macros and the automated downloading of SwiftSDKs need to know the version of the compiler so we can fetch compatible binaries. The swiftc compiler has a --print-target-info options which dumps out a JSON structure that contains the compilerVersion. We already use info in this structure to determine the hostTriple for the UserToolchain.
This adds the swiftCompilerVersion to UserToolchain that uses a couple of regex's to pull out the Swift compiler version. This is then used by the prebuilts feature instead of our current hardcodeing of the swift toolchain version.
This also turns the prebuilts feature on by default which was supposed to be done in the last update.