From ec5cf794712d105a81fa08e47ca68dc2ab3871f2 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Mon, 26 Feb 2024 20:28:10 +0100 Subject: [PATCH 1/2] chore(bazel): add MODULE.bazel files for bzlmod Signed-off-by: Matthieu MOREL --- .gitignore | 3 +++ bazel/.bazelrc | 1 + bazel/MODULE.bazel | 27 +++++++++++++++++++++++++++ bazel/WORKSPACE.bzlmod | 0 4 files changed, 31 insertions(+) create mode 100644 bazel/.bazelrc create mode 100644 bazel/MODULE.bazel create mode 100644 bazel/WORKSPACE.bzlmod diff --git a/.gitignore b/.gitignore index b876b1dd7..7057db9c9 100644 --- a/.gitignore +++ b/.gitignore @@ -179,3 +179,6 @@ $RECYCLE.BIN/ !gh-actions/**/dist !gh-actions/github/mutex/lib + +# Bazel +MODULE.bazel.lock diff --git a/bazel/.bazelrc b/bazel/.bazelrc new file mode 100644 index 000000000..710c4d81a --- /dev/null +++ b/bazel/.bazelrc @@ -0,0 +1 @@ +common --noenable_bzlmod diff --git a/bazel/MODULE.bazel b/bazel/MODULE.bazel new file mode 100644 index 000000000..32eb691f5 --- /dev/null +++ b/bazel/MODULE.bazel @@ -0,0 +1,27 @@ +module(name = "envoy_toolshed", version = "") + +bazel_dep(name = "aspect_bazel_lib", version = "2.4.2") +bazel_dep(name = "bazel_skylib", version = "1.5.0") +bazel_dep(name = "rules_pkg", version = "0.7.0") +bazel_dep(name = "rules_python", version = "0.31.0") +# -- bazel_dep definitions -- # + +bazel_lib_toolchains = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains") +bazel_lib_toolchains.jq() +use_repo(bazel_lib_toolchains, "jq_toolchains") + +python = use_extension("@rules_python//python/extensions:python.bzl", "python") +python.toolchain(python_version = "3.11") + +pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") +pip.parse( + hub_name = "pip3", + python_version = "3.11", + requirements_lock = "//:requirements.txt", +) +pip.parse( + hub_name = "website_pip3", + python_version = "3.11", + requirements_lock = "//website:requirements.txt", +) +use_repo(pip, "pip3", "website_pip3") diff --git a/bazel/WORKSPACE.bzlmod b/bazel/WORKSPACE.bzlmod new file mode 100644 index 000000000..e69de29bb From 1c20f5b96951d3a2b71f59da74421bec3f715b45 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Wed, 5 Jun 2024 12:49:14 +0200 Subject: [PATCH 2/2] Update .bazelrc Signed-off-by: Matthieu MOREL --- bazel/.bazelrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/.bazelrc b/bazel/.bazelrc index 710c4d81a..27b618914 100644 --- a/bazel/.bazelrc +++ b/bazel/.bazelrc @@ -1 +1 @@ -common --noenable_bzlmod +common --enable_bzlmod=0