Skip to content

Commit 6a2e136

Browse files
authored
fix(builtin): allow bazel version to have semver build metadata (#2624)
1 parent ec3d22f commit 6a2e136

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

internal/common/check_version.bzl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ def parse_version(version_string):
3333
# Remove commit from version.
3434
version = version_string.split(" ", 1)[0]
3535

36+
# Remove semver "build metadata" tag
37+
version = version.split("+", 1)[0]
38+
3639
# Split into (release, date) parts and only return the release
3740
# as a tuple of integers.
3841
parts = version.split("-", 1)

internal/common/check_version_test.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ def _check_version_test_impl(ctx):
88
asserts.equals(env, False, check_version("1.2.2", "1.2.3"))
99
asserts.equals(env, True, check_version("1.12.3", "1.2.1"))
1010
asserts.equals(env, True, check_version("0.8.0rc2", "0.8.0"))
11+
asserts.equals(env, True, check_version("0.8.0+custombuild", "0.8.0"))
1112
asserts.equals(env, True, check_version_range("1.2.2", "1.2.1", "1.2.3"))
1213
asserts.equals(env, False, check_version_range("1.2.0", "1.2.1", "1.2.3"))
1314
asserts.equals(env, False, check_version_range("1.2.4", "1.2.1", "1.2.3"))

0 commit comments

Comments
 (0)