From b8fb19a8a1a9e9d85c9c0fba764b858509e17264 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Fri, 5 Jul 2024 18:15:22 +0000 Subject: [PATCH 1/2] Publish aspect-build/rules_lint@v1.0.0-rc5 --- .../aspect_rules_lint/1.0.0-rc5/MODULE.bazel | 39 +++++++++++++++++++ .../patches/module_dot_bazel_version.patch | 14 +++++++ .../aspect_rules_lint/1.0.0-rc5/presubmit.yml | 14 +++++++ .../aspect_rules_lint/1.0.0-rc5/source.json | 9 +++++ modules/aspect_rules_lint/metadata.json | 3 +- 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 modules/aspect_rules_lint/1.0.0-rc5/MODULE.bazel create mode 100644 modules/aspect_rules_lint/1.0.0-rc5/patches/module_dot_bazel_version.patch create mode 100644 modules/aspect_rules_lint/1.0.0-rc5/presubmit.yml create mode 100644 modules/aspect_rules_lint/1.0.0-rc5/source.json diff --git a/modules/aspect_rules_lint/1.0.0-rc5/MODULE.bazel b/modules/aspect_rules_lint/1.0.0-rc5/MODULE.bazel new file mode 100644 index 00000000000..2f44cc5c85e --- /dev/null +++ b/modules/aspect_rules_lint/1.0.0-rc5/MODULE.bazel @@ -0,0 +1,39 @@ +"Bazel dependencies" + +module( + name = "aspect_rules_lint", + version = "1.0.0-rc5", + compatibility_level = 1, +) + +bazel_dep(name = "aspect_bazel_lib", version = "2.5.0") + +# Needed in the root because we use js_lib_helpers in our aspect impl +# Minimum version needs 'chore: bump bazel-lib to 2.0 by @alexeagle in #1311' +# to allow users on bazel-lib 2.0 +bazel_dep(name = "aspect_rules_js", version = "1.40.0") +bazel_dep(name = "bazel_skylib", version = "1.4.2") +bazel_dep(name = "platforms", version = "0.0.7") +bazel_dep(name = "rules_multirun", version = "0.9.0") +bazel_dep(name = "rules_multitool", version = "0.4.0") + +# Needed in the root because we dereference ProtoInfo in our aspect impl +bazel_dep(name = "rules_proto", version = "6.0.0") + +# Needed in the root because we dereference the toolchain in our aspect impl +bazel_dep(name = "rules_buf", version = "0.1.1") +bazel_dep(name = "toolchains_protoc", version = "0.2.1") + +multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool") +multitool.hub(lockfile = "//format:multitool.lock.json") +multitool.hub(lockfile = "//lint:multitool.lock.json") +use_repo(multitool, "multitool") + +# Locally, use newer bazel-lib for stardoc +single_version_override( + module_name = "aspect_bazel_lib", + version = "2.7.7", +) + +# 0.5.4 is the first version with bzlmod support +bazel_dep(name = "stardoc", version = "0.5.4", dev_dependency = True, repo_name = "io_bazel_stardoc") diff --git a/modules/aspect_rules_lint/1.0.0-rc5/patches/module_dot_bazel_version.patch b/modules/aspect_rules_lint/1.0.0-rc5/patches/module_dot_bazel_version.patch new file mode 100644 index 00000000000..f0fbc03a9da --- /dev/null +++ b/modules/aspect_rules_lint/1.0.0-rc5/patches/module_dot_bazel_version.patch @@ -0,0 +1,14 @@ +=================================================================== +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -1,9 +1,9 @@ + "Bazel dependencies" + + module( + name = "aspect_rules_lint", +- version = "0.0.0", ++ version = "1.0.0-rc5", + compatibility_level = 1, + ) + + bazel_dep(name = "aspect_bazel_lib", version = "2.5.0") diff --git a/modules/aspect_rules_lint/1.0.0-rc5/presubmit.yml b/modules/aspect_rules_lint/1.0.0-rc5/presubmit.yml new file mode 100644 index 00000000000..c810b54054f --- /dev/null +++ b/modules/aspect_rules_lint/1.0.0-rc5/presubmit.yml @@ -0,0 +1,14 @@ +bcr_test_module: + module_path: "example" + matrix: + bazel: ["7.x", "6.x"] + platform: ["debian10", "macos", "ubuntu2004"] + tasks: + run_tests: + name: "Run test module" + bazel: ${{ bazel }} + platform: ${{ platform }} + environment: + BAZELISK_BASE_URL: "https://github.com/bazelbuild/bazel/releases/download/" + test_targets: + - "//..." diff --git a/modules/aspect_rules_lint/1.0.0-rc5/source.json b/modules/aspect_rules_lint/1.0.0-rc5/source.json new file mode 100644 index 00000000000..f4366f1b42a --- /dev/null +++ b/modules/aspect_rules_lint/1.0.0-rc5/source.json @@ -0,0 +1,9 @@ +{ + "integrity": "sha256-RVV9MjYCSiEZWY+MpPsKsgNWa8mYAihbwMh2S7XuLjo=", + "strip_prefix": "rules_lint-1.0.0-rc5", + "url": "https://github.com/aspect-build/rules_lint/releases/download/v1.0.0-rc5/rules_lint-v1.0.0-rc5.tar.gz", + "patches": { + "module_dot_bazel_version.patch": "sha256-q/gRx7aUbuxvXl42pl2qpxU8LOt0UMJkPnl3pw4fxWo=" + }, + "patch_strip": 1 +} diff --git a/modules/aspect_rules_lint/metadata.json b/modules/aspect_rules_lint/metadata.json index 5ecb3eab446..ad062a6475f 100644 --- a/modules/aspect_rules_lint/metadata.json +++ b/modules/aspect_rules_lint/metadata.json @@ -40,7 +40,8 @@ "1.0.0-rc1", "1.0.0-rc2", "1.0.0-rc3", - "1.0.0-rc4" + "1.0.0-rc4", + "1.0.0-rc5" ], "yanked_versions": {} } From 9c11bd886cb3aed80fe360d5f59201e374c9fae0 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Fri, 5 Jul 2024 11:30:41 -0700 Subject: [PATCH 2/2] skip mac testing, something broken with RBE on bazel CI --- modules/aspect_rules_lint/1.0.0-rc5/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/aspect_rules_lint/1.0.0-rc5/presubmit.yml b/modules/aspect_rules_lint/1.0.0-rc5/presubmit.yml index c810b54054f..33462e87a38 100644 --- a/modules/aspect_rules_lint/1.0.0-rc5/presubmit.yml +++ b/modules/aspect_rules_lint/1.0.0-rc5/presubmit.yml @@ -2,7 +2,7 @@ bcr_test_module: module_path: "example" matrix: bazel: ["7.x", "6.x"] - platform: ["debian10", "macos", "ubuntu2004"] + platform: ["debian10", "ubuntu2004"] tasks: run_tests: name: "Run test module"