fix(builtin): allow bazel version to have semver build metadata (#2624)

bazel-contrib · Apr 25, 2021 · 6a2e136 · 6a2e136
1 parent ec3d22f
commit 6a2e136
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/internal/common/check_version.bzl b/internal/common/check_version.bzl
@@ -33,6 +33,9 @@ def parse_version(version_string):
     # Remove commit from version.
     version = version_string.split(" ", 1)[0]
 
+    # Remove semver "build metadata" tag
+    version = version.split("+", 1)[0]
+
     # Split into (release, date) parts and only return the release
     # as a tuple of integers.
     parts = version.split("-", 1)

diff --git a/internal/common/check_version_test.bzl b/internal/common/check_version_test.bzl
@@ -8,6 +8,7 @@ def _check_version_test_impl(ctx):
     asserts.equals(env, False, check_version("1.2.2", "1.2.3"))
     asserts.equals(env, True, check_version("1.12.3", "1.2.1"))
     asserts.equals(env, True, check_version("0.8.0rc2", "0.8.0"))
+    asserts.equals(env, True, check_version("0.8.0+custombuild", "0.8.0"))
     asserts.equals(env, True, check_version_range("1.2.2", "1.2.1", "1.2.3"))
     asserts.equals(env, False, check_version_range("1.2.0", "1.2.1", "1.2.3"))
     asserts.equals(env, False, check_version_range("1.2.4", "1.2.1", "1.2.3"))