From 3e5732fd935e691033680f08ab9a3a0b6fcc9335 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 7 Jul 2024 16:49:05 +0000 Subject: [PATCH 1/2] Publish aherrmann/rules_zig@v0.5.0 --- modules/rules_zig/0.5.0/MODULE.bazel | 68 +++++++++++++++++++ .../patches/module_dot_bazel_version.patch | 12 ++++ modules/rules_zig/0.5.0/presubmit.yml | 22 ++++++ modules/rules_zig/0.5.0/source.json | 9 +++ modules/rules_zig/metadata.json | 3 +- 5 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 modules/rules_zig/0.5.0/MODULE.bazel create mode 100644 modules/rules_zig/0.5.0/patches/module_dot_bazel_version.patch create mode 100644 modules/rules_zig/0.5.0/presubmit.yml create mode 100644 modules/rules_zig/0.5.0/source.json diff --git a/modules/rules_zig/0.5.0/MODULE.bazel b/modules/rules_zig/0.5.0/MODULE.bazel new file mode 100644 index 00000000000..c0f10f2049a --- /dev/null +++ b/modules/rules_zig/0.5.0/MODULE.bazel @@ -0,0 +1,68 @@ +module( + name = "rules_zig", + version = "0.5.0", + compatibility_level = 1, +) + +bazel_dep(name = "aspect_bazel_lib", version = "2.7.8") +bazel_dep(name = "bazel_skylib", version = "1.7.1") +bazel_dep(name = "platforms", version = "0.0.10") + +zig = use_extension("//zig:extensions.bzl", "zig") +zig.index(file = "//zig/private:versions.json") +use_repo(zig, "zig_toolchains") + +register_toolchains("@rules_zig//zig/target:all") + +register_toolchains("@zig_toolchains//:all") + +zig_dev = use_extension( + "//zig:extensions.bzl", + "zig", + dev_dependency = True, +) +zig_dev.toolchain(zig_version = "0.13.0") +zig_dev.toolchain(zig_version = "0.12.1") +zig_dev.toolchain(zig_version = "0.12.0") +zig_dev.toolchain(zig_version = "0.11.0") + +bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) +bazel_dep(name = "stardoc", version = "0.7.0", dev_dependency = True, repo_name = "io_bazel_stardoc") +bazel_dep(name = "gazelle", version = "0.37.0", dev_dependency = True, repo_name = "bazel_gazelle") +bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependency = True) +bazel_dep( + name = "buildifier_prebuilt", + version = "6.4.0", + dev_dependency = True, +) +bazel_dep(name = "rules_multirun", version = "0.9.0", dev_dependency = True) +bazel_dep(name = "rules_python", version = "0.33.2", dev_dependency = True) +bazel_dep( + name = "rules_bazel_integration_test", + version = "0.24.1", + dev_dependency = True, +) + +bazel_binaries = use_extension( + "@rules_bazel_integration_test//:extensions.bzl", + "bazel_binaries", + dev_dependency = True, +) + +# NOTE: Keep in sync with WORKSPACE. +bazel_binaries.download(version_file = "//:.bazelversion") +bazel_binaries.download(version = "7.0.0") +use_repo( + bazel_binaries, + "bazel_binaries", + "bazel_binaries_bazelisk", + "build_bazel_bazel_.bazelversion", + "build_bazel_bazel_7_0_0", +) + +# TODO[AH] Should be an implicit transitive dependency through rules_bazel_integration_test. +# However, if we do not include it explicitly, then the runfiles resolution for +# cgrindel_bazel_starlib/shlib/lib/message.sh fails in +# rules_bazel_integration_test/tools/update_deleted_packages.sh when invoked +# through the rules_multirun target //util:update. +bazel_dep(name = "cgrindel_bazel_starlib", version = "0.20.2", dev_dependency = True) diff --git a/modules/rules_zig/0.5.0/patches/module_dot_bazel_version.patch b/modules/rules_zig/0.5.0/patches/module_dot_bazel_version.patch new file mode 100644 index 00000000000..5d9d8ece5ca --- /dev/null +++ b/modules/rules_zig/0.5.0/patches/module_dot_bazel_version.patch @@ -0,0 +1,12 @@ +=================================================================== +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -1,7 +1,7 @@ + module( + name = "rules_zig", +- version = "0.0.0", ++ version = "0.5.0", + compatibility_level = 1, + ) + + bazel_dep(name = "aspect_bazel_lib", version = "2.7.8") diff --git a/modules/rules_zig/0.5.0/presubmit.yml b/modules/rules_zig/0.5.0/presubmit.yml new file mode 100644 index 00000000000..3956200040e --- /dev/null +++ b/modules/rules_zig/0.5.0/presubmit.yml @@ -0,0 +1,22 @@ +matrix: + platform: ["ubuntu2204", "macos"] # ["windows"] + bazel: [7.x, 8.x] +tasks: + run_tests: + name: "Run tests" + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - "//..." +bcr_test_module: + module_path: "e2e/workspace" + matrix: + platform: ["ubuntu2204", "macos"] # ["windows"] + bazel: [7.x, 8.x] + tasks: + run_tests: + name: "Run test module" + platform: ${{ platform }} + bazel: ${{ bazel }} + test_targets: + - "//..." diff --git a/modules/rules_zig/0.5.0/source.json b/modules/rules_zig/0.5.0/source.json new file mode 100644 index 00000000000..ff9b953089a --- /dev/null +++ b/modules/rules_zig/0.5.0/source.json @@ -0,0 +1,9 @@ +{ + "integrity": "sha256-SB89GREp/paA9DGGWUlTa7Hf8g/Hf0pU0KS75ygjQ18=", + "strip_prefix": "rules_zig-0.5.0", + "url": "https://github.com/aherrmann/rules_zig/releases/download/v0.5.0/rules_zig-0.5.0.tar.gz", + "patches": { + "module_dot_bazel_version.patch": "sha256-I5gjxCKWo3xZD9mI5a5qtsS2lc3u/l8qQS7HNosFH50=" + }, + "patch_strip": 1 +} diff --git a/modules/rules_zig/metadata.json b/modules/rules_zig/metadata.json index 98a202ae5b4..5a522246bd1 100644 --- a/modules/rules_zig/metadata.json +++ b/modules/rules_zig/metadata.json @@ -14,7 +14,8 @@ "0.1.0", "0.2.0", "0.3.0", - "0.4.0" + "0.4.0", + "0.5.0" ], "yanked_versions": {} } From 7e68b9401636cf80efd7efa032baa36c1f11a637 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 8 Jul 2024 18:10:42 +0200 Subject: [PATCH 2/2] Remove Bazel 8.x from presubmit.yml Bazel 8 is not released, yet. --- modules/rules_zig/0.5.0/presubmit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rules_zig/0.5.0/presubmit.yml b/modules/rules_zig/0.5.0/presubmit.yml index 3956200040e..268d748bed5 100644 --- a/modules/rules_zig/0.5.0/presubmit.yml +++ b/modules/rules_zig/0.5.0/presubmit.yml @@ -1,6 +1,6 @@ matrix: platform: ["ubuntu2204", "macos"] # ["windows"] - bazel: [7.x, 8.x] + bazel: [7.x] tasks: run_tests: name: "Run tests" @@ -12,7 +12,7 @@ bcr_test_module: module_path: "e2e/workspace" matrix: platform: ["ubuntu2204", "macos"] # ["windows"] - bazel: [7.x, 8.x] + bazel: [7.x] tasks: run_tests: name: "Run test module"