Merge pull request #29406 from Rostepher/longer-swift-version-support

[Build System: build-script] Support Swift versions with up to four version components, matching Clang.

Author: Rostepher

utils/build_swift/build_swift/argparse/types.py

@@ -158,8 +158,8 @@ class SwiftVersionType(RegexType):
     """
 
     ERROR_MESSAGE = ('Invalid version value, must be "MAJOR.MINOR" '
-                     'or "MAJOR.MINOR.PATCH"')
-    VERSION_REGEX = r'^(\d+)\.(\d+)(\.(\d+))?$'
+                     ', "MAJOR.MINOR.PATCH" or "MAJOR.MINOR.PATCH.PATCH"')
+    VERSION_REGEX = r'^(\d+)\.(\d+)(\.(\d+))?(\.(\d+))?$'
 
     def __init__(self):
         super(SwiftVersionType, self).__init__(

utils/build_swift/tests/build_swift/argparse/test_types.py

@@ -188,13 +188,17 @@ def test_valid_swift_version(self):
         swift_version_type('200.0.56')
         swift_version_type('100000.0.1')
 
+        version = swift_version_type('100.0.999.1')
+        self.assertIsInstance(version, Version)
+        self.assertEqual(version.components, (100, 0, 999, 1))
+
     def test_invalid_swift_version(self):
         swift_version_type = types.SwiftVersionType()
 
         with self.assertRaises(ArgumentTypeError):
             swift_version_type('2')
-            swift_version_type('1.8.0.2')
-            swift_version_type('100.0.56.1')
+            swift_version_type('1.8.0.2.3')
+            swift_version_type('100.0.56.1.85')
 
 
 class TestShellSplitType(unittest.TestCase):