From 6a2e136c9167df017b77255181cbdbd81a34762b Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Sun, 25 Apr 2021 07:11:24 -0700 Subject: [PATCH] fix(builtin): allow bazel version to have semver build metadata (#2624) --- internal/common/check_version.bzl | 3 +++ internal/common/check_version_test.bzl | 1 + 2 files changed, 4 insertions(+) diff --git a/internal/common/check_version.bzl b/internal/common/check_version.bzl index dc36e5a001..fe8eab25c9 100644 --- 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 index b85ac931f2..da986af549 100644 --- 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"))