From 713aaade0465ac92f13d9ebe815985fd2b9cbc2f Mon Sep 17 00:00:00 2001
From: Manuel Naranjo <manuel.naranjo@booking.com>
Date: Sun, 14 Jul 2024 12:03:20 +0200
Subject: [PATCH] bazel: adopt prebuilt protoc

Stop waisting valuable CI time in protoc building
---
 .bazelrc     |  1 +
 BUILD.bazel  |  2 +-
 MODULE.bazel | 16 ++++++++--------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index c90ef21..15a1728 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -7,6 +7,7 @@ import %workspace%/.aspect/bazelrc/debug.bazelrc
 import %workspace%/.aspect/bazelrc/performance.bazelrc
 
 # Specific project flags go here if we have some
+common --incompatible_enable_proto_toolchain_resolution
 
 # register toolchains with prebuilts
 common:prebuilt-toolchain --extra_toolchains=@bazeldnf_toolchains//:all
diff --git a/BUILD.bazel b/BUILD.bazel
index ccdc229..0be275f 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@bazel_gazelle//:def.bzl", "gazelle")
 load("@buildifier_prebuilt//:rules.bzl", "buildifier")
+load("@gazelle//:def.bzl", "gazelle")
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
 load("//bazeldnf:defs.bzl", "bazeldnf", "rpmtree", "tar2files")
 
diff --git a/MODULE.bazel b/MODULE.bazel
index 4646e8a..42e9601 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -15,17 +15,17 @@ register_toolchains("@bazeldnf_toolchains//:all")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "platforms", version = "0.0.10")
 
-bazel_dep(name = "gazelle", version = "0.37.0", dev_dependency = True, repo_name = "bazel_gazelle")
-bazel_dep(name = "rules_go", version = "0.48.0", dev_dependency = True, repo_name = "io_bazel_rules_go")
-bazel_dep(name = "protobuf", version = "27.1", dev_dependency = True, repo_name = "com_google_protobuf")
-bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True)
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "gazelle", version = "0.37.0", dev_dependency = True)
+bazel_dep(name = "rules_go", version = "0.49.0", dev_dependency = True, repo_name = "io_bazel_rules_go")
+bazel_dep(name = "toolchains_protoc", version = "0.3.1", dev_dependency = True)
+bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.8", dev_dependency = True)
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
-bazel_dep(name = "rules_pkg", version = "0.10.1", dev_dependency = True)
+bazel_dep(name = "rules_pkg", version = "1.0.1", dev_dependency = True)
 
-go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
+go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
 go_deps.config(
-    debug_mode = True,
+    debug_mode = False,
 )
 
 # Validate a go.mod replace directive works.