From f57c1ad880f801483d59094f2924e83719891a7a Mon Sep 17 00:00:00 2001
From: Simon Marlow <smarlow@meta.com>
Date: Sat, 1 Jun 2024 19:18:00 -0700
Subject: [PATCH] Fix --use-shipit

Summary:
X-link: https://github.com/facebookincubator/zstrong/pull/852

It was using the old PHP shipit script

Reviewed By: chadaustin

Differential Revision: D58013009

fbshipit-source-id: 97f0c31b897c04217ca5dd62fbe6cc2a55d280c8
---
 build/fbcode_builder/getdeps/fetcher.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py
index f02dd447b..c4775cf48 100644
--- a/build/fbcode_builder/getdeps/fetcher.py
+++ b/build/fbcode_builder/getdeps/fetcher.py
@@ -588,7 +588,7 @@ class SimpleShipitTransformerFetcher(Fetcher):
 
 
 class ShipitTransformerFetcher(Fetcher):
-    SHIPIT = "/var/www/scripts/opensource/shipit/run_shipit.php"
+    SHIPIT = "/var/www/scripts/opensource/codesync"
 
     def __init__(self, build_options, project_name) -> None:
         self.build_options = build_options
@@ -614,12 +614,13 @@ class ShipitTransformerFetcher(Fetcher):
         try:
             if os.path.exists(tmp_path):
                 shutil.rmtree(tmp_path)
+            os.makedirs(os.path.dirname(tmp_path), exist_ok=True)
 
             # Run shipit
             run_cmd(
                 [
-                    "php",
                     ShipitTransformerFetcher.SHIPIT,
+                    "shipit",
                     "--project=" + self.project_name,
                     "--create-new-repo",
                     "--source-repo-dir=" + self.build_options.fbsource_dir,
@@ -628,7 +629,6 @@ class ShipitTransformerFetcher(Fetcher):
                     "--skip-source-pull",
                     "--skip-source-clean",
                     "--skip-push",
-                    "--skip-reset",
                     "--destination-use-anonymous-https",
                     "--create-new-repo-output-path=" + tmp_path,
                 ]