Skip to content

Commit 1def87d

Browse files
author
Zachary 'Clack' Cole
authored
Merge pull request swiftlang#222 from apple/relax-version-check
Update project_precommit_check's 4.2 swiftlang version
2 parents 818f629 + f96ffd8 commit 1def87d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

project_precommit_check

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ supported_configs = {
6868
},
6969
'4.2': {
7070
'version': 'Apple Swift version 4.2 '
71-
'(swiftlang-1000.0.16.9 clang-1000.10.25.3)\n'
71+
'(swiftlang-1000.0.25.1 clang-1000.10.28.1)\n'
7272
'Target: x86_64-apple-darwin17.7.0\n',
73-
'description': 'Xcode 10 Beta 2 (contains Swift 4.2)',
73+
'description': 'Xcode 10 Beta 3 (contains Swift 4.2)',
7474
'branch': 'swift-4.2-branch'
7575
}
7676
},
@@ -145,7 +145,7 @@ def is_correct_swift_version(swiftc, compatibility_version):
145145
error_msg = "error: please select {description}".format(
146146
description=supported_configs[platform.system()][compatibility_version]['description']
147147
)
148-
if swift_version != expected_swift_version:
148+
if swift_version.split("\n")[0] != expected_swift_version.split("\n")[0]:
149149
common.debug_print("--- Version check failed ---")
150150
common.debug_print("Expected version:\n" + expected_swift_version)
151151
common.debug_print("Current version:\n" + swift_version)

0 commit comments

Comments
 (0)