From ce09fb7f5cfe228b3bbcd818c7b06734a316474b Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Thu, 9 Feb 2023 10:42:00 -0500 Subject: [PATCH] - bump dependency on rules_license to 0.0.4 - That picks up version that users cfg=exec instead of cfg=host - It still works with bazel 5.x. The next rules_license might not. - bump our version to 0.0.7 for next release - add presubmit check that we did not mistmatch the license --- BUILD | 5 ++++- MODULE.bazel | 4 ++-- WORKSPACE | 5 +++-- tests/BUILD | 18 ++++++++++++++++++ version.bzl | 2 +- 5 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 tests/BUILD diff --git a/BUILD b/BUILD index 7aea923..256d1a6 100644 --- a/BUILD +++ b/BUILD @@ -13,7 +13,10 @@ license( license_text = "LICENSE", ) -exports_files(["LICENSE"]) +exports_files([ + "LICENSE", + "MODULE.bazel", +]) filegroup( name = "srcs", diff --git a/MODULE.bazel b/MODULE.bazel index 34badd4..ca543d0 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,7 +1,7 @@ module( name = "platforms", - version = "0.0.8", # keep in sync with version.bzl + version = "0.0.7", # keep in sync with version.bzl compatibility_level = 1, ) -bazel_dep(name = "rules_license", version = "0.0.3") +bazel_dep(name = "rules_license", version = "0.0.4") diff --git a/WORKSPACE b/WORKSPACE index 8df60fd..623318a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -5,7 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_license", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz", + "https://github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz", ], - sha256 = "00ccc0df21312c127ac4b12880ab0f9a26c1cff99442dc6c5a331750360de3c3", + sha256 = "6157e1e68378532d0241ecd15d3c45f6e5cfd98fc10846045509fb2a7cc9e381", ) diff --git a/tests/BUILD b/tests/BUILD new file mode 100644 index 0000000..696dd6d --- /dev/null +++ b/tests/BUILD @@ -0,0 +1,18 @@ +load("//:version.bzl", "version") + +package(default_visibility = ["//visibility:private"]) + +# This is a quick hack to make sure that version.bzl agrees with MODULE.bazel +# It only works from Linux, but that is sufficient, becuase we do a presubmit +# run linux, so we will still catch a mismatch. +genrule( + name = "versions_match", + cmd = """grep 'version = "%s",' $(location //:MODULE.bazel) >$(location :found_it)""" % version, + outs = ["found_it"], + tools = [ + "//:MODULE.bazel", + ] , + target_compatible_with = [ + "//os:linux", + ], +) diff --git a/version.bzl b/version.bzl index f4145ce..94442ff 100644 --- a/version.bzl +++ b/version.bzl @@ -13,4 +13,4 @@ # limitations under the License. """The version of bazelbuild/platforms.""" -version = "0.0.6" +version = "0.0.7"