From 323a279ec5b2e91f26630830464fb45a3ad10564 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Fri, 12 Jul 2024 14:03:17 -0700
Subject: [PATCH] [CI] Enable bzlmod (#2995)

---
 .bazelrc     | 3 ---
 MODULE.bazel | 4 ++--
 ci/do_ci.ps1 | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index fc170b0e8b..f169347647 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -4,9 +4,6 @@
 # bazel configurations for running tests under sanitizers.
 # Based on https://github.com/bazelment/trunk/blob/master/tools/bazel.rc
 
-# TODO: Remove once support is added, avoid MODULE.bazel creation for now
-common --enable_bzlmod=false
-
 # Enable automatic configs based on platform
 common --enable_platform_specific_config
 
diff --git a/MODULE.bazel b/MODULE.bazel
index 7b84c2b719..4a03753e15 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -10,8 +10,8 @@ module(
 
 bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "curl", version = "8.4.0")
-bazel_dep(name = "grpc", version = "1.62.1", repo_name = "com_github_grpc_grpc")
+bazel_dep(name = "curl", version = "8.8.0")
+bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json")
 bazel_dep(name = "opentelemetry-proto", version = "1.3.1", repo_name = "com_github_opentelemetry_proto")
 bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
diff --git a/ci/do_ci.ps1 b/ci/do_ci.ps1
index 62e174854e..bcae6359bb 100644
--- a/ci/do_ci.ps1
+++ b/ci/do_ci.ps1
@@ -11,8 +11,8 @@ $nproc = (Get-ComputerInfo).CsNumberOfLogicalProcessors
 $SRC_DIR = (Get-Item -Path ".\").FullName
 
 # Workaround https://github.com/bazelbuild/bazel/issues/18683
-$BAZEL_STARTUP_OPTIONS = "--output_base=C:\Out"
-$BAZEL_OPTIONS = "--copt=-DENABLE_ASYNC_EXPORT"
+$BAZEL_STARTUP_OPTIONS = "--output_base=C:\O"
+$BAZEL_OPTIONS = "--copt=-DENABLE_ASYNC_EXPORT --compilation_mode=dbg"
 $BAZEL_TEST_OPTIONS = "$BAZEL_OPTIONS --test_output=errors"
 
 if (!(test-path build)) {