From 058b78dd018ed89b4fd16c2b7eaef14e2d8ef49d Mon Sep 17 00:00:00 2001
From: Mark Duckworth <1124037+MarkDuckworth@users.noreply.github.com>
Date: Mon, 3 Jun 2024 17:24:01 +0000
Subject: [PATCH 1/3] Attempting to fix owlbot proto copying to the types
 folder by using s.copy.

---
 owlbot.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/owlbot.py b/owlbot.py
index c1d2a1819..fb1d27ec4 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -191,9 +191,9 @@
 
     # Copy types into types/
     # These files were generated by node.compile_protos_hermetic() above.
-    os.system("cp build/src/v1/firestore*.d.ts types/v1")
-    os.system("cp build/src/v1beta1/firestore_client.d.ts types/v1beta1")
-    os.system("cp build/protos/firestore*.d.ts types/protos")
+    s.copy("build/src/v1/firestore*.d.ts", "types/v1")
+    s.copy("build/src/v1beta1/firestore_client.d.ts", "types/v1beta1")
+    s.copy("build/protos/firestore*.d.ts", "types/protos")
     s.replace(
         "types/v1/firestore_client.d.ts",
         "../../protos",

From 253ba31eabda7df6f816f0f3d447c183ced10fc2 Mon Sep 17 00:00:00 2001
From: Mark Duckworth <1124037+MarkDuckworth@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:04:11 +0000
Subject: [PATCH 2/3] build: Adding compile step to owlbot to generate .d.ts
 files

---
 owlbot.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/owlbot.py b/owlbot.py
index fb1d27ec4..dc5c71a42 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -8,6 +8,7 @@
 from synthtool import _tracked_paths
 import shutil
 from synthtool import shell
+from synthtool.log import logger
 
 logging.basicConfig(level=logging.DEBUG)
 
@@ -190,7 +191,8 @@
     os.chdir("../../")
 
     # Copy types into types/
-    # These files were generated by node.compile_protos_hermetic() above.
+    logger.debug("Running compile...")
+    shell.run(["npm", "run", "compile"], hide_output=True)
     s.copy("build/src/v1/firestore*.d.ts", "types/v1")
     s.copy("build/src/v1beta1/firestore_client.d.ts", "types/v1beta1")
     s.copy("build/protos/firestore*.d.ts", "types/protos")

From 1e2c3b506d8529eb25677aca14181a7f9b4a9f2e Mon Sep 17 00:00:00 2001
From: Mark Duckworth <1124037+MarkDuckworth@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:08:54 +0000
Subject: [PATCH 3/3] Conflict markers

---
 owlbot.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/owlbot.py b/owlbot.py
index 7cdde7d7f..dc5c71a42 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -191,12 +191,8 @@
     os.chdir("../../")
 
     # Copy types into types/
-<<<<<<< HEAD
     logger.debug("Running compile...")
     shell.run(["npm", "run", "compile"], hide_output=True)
-=======
-    # These files were generated by node.compile_protos_hermetic() above.
->>>>>>> origin
     s.copy("build/src/v1/firestore*.d.ts", "types/v1")
     s.copy("build/src/v1beta1/firestore_client.d.ts", "types/v1beta1")
     s.copy("build/protos/firestore*.d.ts", "types/protos")