From 181cf95b2fd5e4943b61d8ee216d16f95df817d6 Mon Sep 17 00:00:00 2001
From: Ted Xie <tedx@google.com>
Date: Tue, 27 Feb 2024 13:58:09 -0500
Subject: [PATCH 1/2] Add BazelCI tasks for example app + bzlmod and
 macos_arm64

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

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 9d3ca1709..47784e19d 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -97,7 +97,7 @@ tasks:
   macos_arm64_rules_bzlmod:
     platform: macos_arm64
     <<: *rules_bzlmod
-  basicapp:
+  ubuntu2004_basicapp:
     platform: ubuntu2004
     name: basicapp
     working_directory: examples/basicapp
@@ -105,3 +105,28 @@ tasks:
       <<: *rules_flags
     build_targets:
       - "//java/com/basicapp:basic_app"
+  ubuntu2004_basicapp_bzlmod:
+    platform: ubuntu2004
+    name: basicapp
+    working_directory: examples/basicapp
+    build_flags:
+      <<: *rules_bzlmod
+    build_targets:
+      - "//java/com/basicapp:basic_app"
+  macos_arm64_basicapp:
+    platform: macos_arm64
+    name: basicapp
+    working_directory: examples/basicapp
+    build_flags:
+      <<: *rules_flags
+    build_targets:
+      - "//java/com/basicapp:basic_app"
+  macos_arm64_basicapp_bzlmod:
+    platform: macos_arm64
+    name: basicapp
+    working_directory: examples/basicapp
+    build_flags:
+      <<: *rules_bzlmod
+    build_targets:
+      - "//java/com/basicapp:basic_app"
+

From 1c1495b859d2044fe01735f423463d4bcb633bcd Mon Sep 17 00:00:00 2001
From: Ted Xie <tedx@google.com>
Date: Tue, 27 Feb 2024 14:20:55 -0500
Subject: [PATCH 2/2] Fix build flags with bzlmod enabled

---
 .bazelci/presubmit.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 47784e19d..f46590b74 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -98,6 +98,7 @@ tasks:
     platform: macos_arm64
     <<: *rules_bzlmod
   ubuntu2004_basicapp:
+    name: "Basic app ubuntu"
     platform: ubuntu2004
     name: basicapp
     working_directory: examples/basicapp
@@ -106,14 +107,17 @@ tasks:
     build_targets:
       - "//java/com/basicapp:basic_app"
   ubuntu2004_basicapp_bzlmod:
+    name: "Basic app ubuntu bzlmod"
     platform: ubuntu2004
     name: basicapp
     working_directory: examples/basicapp
     build_flags:
-      <<: *rules_bzlmod
+      <<: *rules_flags
+      ? "--enable_bzlmod"
     build_targets:
       - "//java/com/basicapp:basic_app"
   macos_arm64_basicapp:
+    name: "Basic app mac arm64"
     platform: macos_arm64
     name: basicapp
     working_directory: examples/basicapp
@@ -122,11 +126,13 @@ tasks:
     build_targets:
       - "//java/com/basicapp:basic_app"
   macos_arm64_basicapp_bzlmod:
+    name: "Basic app mac arm64 bzlmod"
     platform: macos_arm64
     name: basicapp
     working_directory: examples/basicapp
     build_flags:
-      <<: *rules_bzlmod
+      <<: *rules_flags
+      ? "--enable_bzlmod"
     build_targets:
       - "//java/com/basicapp:basic_app"