Generalize the Swift version regex #519
Open
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
bnbarham
requested review from
aciidgh,
jakepetroules,
mirza-garibovic,
mhrawdon,
neonichu and
owenv
as code owners
|
@swift-ci please test |
| let versionRegex = #/Apple Swift version (?<swiftVersion>[\d.]+) \(swiftlang-(?<swiftlangVersion>[\d.]+) clang-(?<clangVersion>[\d.]+)\)/# | ||
| let releaseVersionRegex = #/(?:Apple )?Swift version (?<swiftVersion>[\d.]+) \(swift-(?<swiftlangVersion>[\d.]+)-RELEASE\)/# | ||
| let developmentVersionRegex = #/Swift version (?<swiftVersion>[\d.]+)-dev \(LLVM (?:\b[0-9a-f]+), Swift (?:\b[0-9a-f]+)\)/# | ||
| let versionRegex = #/Swift version (?<swiftVersion>[\d.]+).*\((?<swiftTag>.*)\)/# |
There was a problem hiding this comment.
Just confirming: works for both Xcode and swift.org toolchains?
There was a problem hiding this comment.
Yes. The different versions we have are:
Apple Swift version 6.1 (swiftlang-6.1.x.x.x clang-1x00.x.x.x) # apple release
Swift version 6.1 (swift-6.1-RELEASE) # swift.org release
Swift version 6.1-dev (LLVM hash, Swift hash) # swift.org nightlies and at desk
And I'm about to put up a PR to make it:
Swift version 6.1 (swift-6.1-DEVELOPMENT-SNAPSHOT-year-month-day-a) # nightlies
Swift version 6.1-dev (Swift hash LLVM hash) # at desk
There was a problem hiding this comment.
The "swiftlang" version was only being used in a single location for a compatibility check that is no longer required. The clang version was unusued (which is unsurprising since it's often not available from the Swift `--version` output). Really we only need the version itself and a unique tag to pass as additional signature data to Swift tasks.
bnbarham
force-pushed
the
update-version-regex
branch
from
087e4d0 to
6bbf726
Compare
|
@swift-ci please test |
owenv
approved these changes
May 22, 2025
jakepetroules
approved these changes
May 22, 2025
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.
The "swiftlang" version was only being used in a single location for a compatibility check that is no longer required. The clang version was unusued (which is unsurprising since it's often not available from the Swift
--versionoutput). Really we only need the version itself and a unique tag to pass as additional signature data to Swift tasks.