Merge pull request swiftlang#36790 from porglezomp-misc/patch-patch-patch

[build-script] Support 5-component Swift versions

Author: porglezomp

utils/build_swift/build_swift/argparse/types.py

@@ -157,9 +157,10 @@ class SwiftVersionType(RegexType):
     """Argument type used to validate Swift version strings.
     """
 
-    ERROR_MESSAGE = ('Invalid version value, must be "MAJOR.MINOR" '
-                     ', "MAJOR.MINOR.PATCH" or "MAJOR.MINOR.PATCH.PATCH"')
-    VERSION_REGEX = r'^(\d+)\.(\d+)(\.(\d+))?(\.(\d+))?$'
+    ERROR_MESSAGE = ('Invalid version value, must be "MAJOR.MINOR"'
+                     ', "MAJOR.MINOR.PATCH", "MAJOR.MINOR.PATCH.PATCH"'
+                     ', or "MAJOR.MINOR.PATCH.PATCH.PATCH".')
+    VERSION_REGEX = r'^(\d+)\.(\d+)(\.(\d+))?(\.(\d+))?(\.(\d+))?$'
 
     def __init__(self):
         super(SwiftVersionType, self).__init__(

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

@@ -192,13 +192,17 @@ def test_valid_swift_version(self):
         self.assertIsInstance(version, Version)
         self.assertEqual(version.components, (100, 0, 999, 1))
 
+        version = swift_version_type('5.4.0.300.205')
+        self.assertIsInstance(version, Version)
+        self.assertEqual(version.components, (5, 4, 0, 300, 205))
+
     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.3')
-            swift_version_type('100.0.56.1.85')
+            swift_version_type('1.8.0.2.3.1')
+            swift_version_type('100.0.56.1.85.1')
 
 
 class TestShellSplitType(unittest.TestCase):