From 61cd39566a6a20f92e8e94ade73aa1eabf151a39 Mon Sep 17 00:00:00 2001
From: Yun Peng <pcloudy@google.com>
Date: Fri, 6 Oct 2023 16:03:52 +0200
Subject: [PATCH 1/2] Disable Bzlmod explicitly for workspace setup

Fixing breaking when --enable_flip is flipped at Bazel@HEAD

https://github.com/bazelbuild/bazel/issues/18958
---
 .bazelci/presubmit.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 8bf06bb..3d958ec 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -9,6 +9,7 @@ tasks:
     platform: ${{platform}}
     bazel: ${{bazel}}
     test_targets:
+      - "--noenable_bzlmod"
       - "..."
   all_tests_bzlmod:
     name: Bzlmod

From 4f0a98647dccd6e69e4ff3cf844fa56440468909 Mon Sep 17 00:00:00 2001
From: Yun Peng <pcloudy@google.com>
Date: Mon, 9 Oct 2023 10:12:50 +0200
Subject: [PATCH 2/2] Update presubmit.yml

---
 .bazelci/presubmit.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 3d958ec..6a53aee 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -8,8 +8,9 @@ tasks:
     name: Workspace
     platform: ${{platform}}
     bazel: ${{bazel}}
+    test_flags:
+      - "--noexperimental_enable_bzlmod"
     test_targets:
-      - "--noenable_bzlmod"
       - "..."
   all_tests_bzlmod:
     name: Bzlmod