From e916b597cc17514a204ec7c9f3fcce911b2eb315 Mon Sep 17 00:00:00 2001 From: Morten Mjelva Date: Tue, 9 May 2023 23:46:32 +0200 Subject: [PATCH 1/5] Add rudimentary support for bzlmod --- MODULE.bazel | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 MODULE.bazel diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 index 000000000..21e0839b3 --- /dev/null +++ b/MODULE.bazel @@ -0,0 +1,20 @@ +module(name = "jsonnet_go", version = "0.0.0") + +bazel_dep(name = "gazelle", version = "0.30.0", repo_name = "bazel_gazelle") +bazel_dep(name = "jsonnet", version = "0.0.0", repo_name = "cpp_jsonnet") +bazel_dep(name = "rules_go", version = "0.39.1", repo_name = "io_bazel_rules_go") + +git_override( + module_name = "jsonnet", + remote = "https://github.com/mortenmj/jsonnet.git", + commit = "df811822d9a31cb3fab9bdf68679ad300f1c12ed", +) + +go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps") +go_deps.from_file(go_mod = "@jsonnet_go//:go.mod") +use_repo( + go_deps, + "com_github_fatih_color", + "com_github_sergi_go_diff", + "io_k8s_sigs_yaml", +) From b0336baebdc1af1101ab9548adcbb8e370d4ab08 Mon Sep 17 00:00:00 2001 From: Morten Mjelva Date: Fri, 26 May 2023 11:05:54 +0000 Subject: [PATCH 2/5] Testing --- .bazelrc | 2 ++ MODULE.bazel | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 .bazelrc diff --git a/.bazelrc b/.bazelrc new file mode 100644 index 000000000..f4521ce8b --- /dev/null +++ b/.bazelrc @@ -0,0 +1,2 @@ +build --registry=https://raw.githubusercontent.com/mortenmj/bazel-central-registry/jsonnet-0.20.0/ +build --enable_bzlmod diff --git a/MODULE.bazel b/MODULE.bazel index 21e0839b3..4bc91ae9c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,15 +1,9 @@ module(name = "jsonnet_go", version = "0.0.0") bazel_dep(name = "gazelle", version = "0.30.0", repo_name = "bazel_gazelle") -bazel_dep(name = "jsonnet", version = "0.0.0", repo_name = "cpp_jsonnet") +bazel_dep(name = "jsonnet", version = "0.20.0", repo_name = "cpp_jsonnet") bazel_dep(name = "rules_go", version = "0.39.1", repo_name = "io_bazel_rules_go") -git_override( - module_name = "jsonnet", - remote = "https://github.com/mortenmj/jsonnet.git", - commit = "df811822d9a31cb3fab9bdf68679ad300f1c12ed", -) - go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps") go_deps.from_file(go_mod = "@jsonnet_go//:go.mod") use_repo( From c4a4afcea482b4554ca718bb294b250afaac00c8 Mon Sep 17 00:00:00 2001 From: Morten Mjelva Date: Fri, 26 May 2023 17:45:27 +0200 Subject: [PATCH 3/5] Update .bazelrc to remove custom registry --- .bazelrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.bazelrc b/.bazelrc index f4521ce8b..02d5fe69a 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,2 +1 @@ -build --registry=https://raw.githubusercontent.com/mortenmj/bazel-central-registry/jsonnet-0.20.0/ build --enable_bzlmod From 260a1868235196604cf6b2c73e7c576b972ebf8b Mon Sep 17 00:00:00 2001 From: Morten Mjelva Date: Fri, 26 May 2023 18:12:33 +0200 Subject: [PATCH 4/5] Update .bazelrc to not enable bzlmod by default --- .bazelrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.bazelrc b/.bazelrc index 02d5fe69a..e69de29bb 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1 +0,0 @@ -build --enable_bzlmod From f237f4dfe22a6c194dfe2eef35323c0abb1ed21b Mon Sep 17 00:00:00 2001 From: Morten Mjelva Date: Sat, 27 May 2023 12:54:42 +0200 Subject: [PATCH 5/5] Remove empty .bazelrc --- .bazelrc | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .bazelrc diff --git a/.bazelrc b/.bazelrc deleted file mode 100644 index e69de29bb..000000000