Improved deploy script error reporting

1 files changed, 22 insertions, 14 deletions

diff --git a/scripts/deploybuild.py b/scripts/deploybuild.py
index c2fba672d..1bb052ef7 100644
--- a/scripts/deploybuild.py
+++ b/scripts/deploybuild.py
@@ -59,13 +59,19 @@ except:
 
 jazz_print("Uploading symbols", "to Sentry")
 subprocess.run(["scripts\sentry-cli.exe", "upload-dif",  "--org", "to", "--project", "zen-server", "x64\\Release\\zenserver.exe", "x64\\Release\\zenserver.pdb"])
-# scripts\sentry-cli.exe upload-dif --org to --project zen-server x64\Release\zenserver.exe x64\Release\zenserver.pdb
 
 # Change into root directory to pick up Perforce environment
 
+jazz_print(f"Determining P4 environment", f"for directory '{engineroot}'")
+
 os.chdir(engineroot)
+
 p4info = P4.info().run()
 
+if p4info is None:
+    jazz_fail("Unable to query P4 info", "do you have source control connectivity?")
+    exit(1)    
+
 if not os.path.samefile(p4info.clientRoot, engineroot):
     print(f"{Fore.RED}Could not find P4 client for UE5 engine root directory '{engineroot}'")
     print(Style.RESET_ALL)
@@ -78,31 +84,33 @@ jazz_print("Reverting", "any previous unsubmitted deploy")
 try:
     P4.revert("Engine/Binaries/Win64/zenserver.*").run()
     P4.revert("Engine/Binaries/Win64/crashpad_handler.exe").run()
-except:
+except Exception as e:
+    # it's not super important to report failure here, it's likely
+    # due to the user not actually having the file checked out (yet)
     pass
 
-jazz_print("Checking out", "zenserver executables")
+jazz_print("Checking out", "(at head) zenserver executables")
 
 try:
     P4.edit("Engine/Binaries/Win64/zenserver.*").run()
     P4.edit("Engine/Binaries/Win64/crashpad_handler.exe").run()
-except:
-    pass
+except Exception as e:
+    jazz_fail("edit failed", str(e))
+    exit(1)
 
-bin_dir = os.path.join(engineroot, "Engine\\Binaries\\Win64")
+target_bin_dir = os.path.join(engineroot, "Engine\\Binaries\\Win64")
 
-jazz_print("Placing zenserver", f"executables into tree at '{bin_dir}'")
+jazz_print("Placing zenserver", f"executables into tree at '{target_bin_dir}'")
 
-crashpadtarget = os.path.join(engineroot, "Engine/Binaries/Win64/crashpad_handler.exe")
+crashpadtarget = os.path.join(target_bin_dir, "crashpad_handler.exe")
 
 try:
-    shutil.copy(os.path.join(zenroot, "x64\Release\zenserver.exe"), os.path.join(bin_dir, "zenserver.exe"))
-    shutil.copy(os.path.join(zenroot, "x64\Release\zenserver.pdb"), os.path.join(bin_dir, "zenserver.pdb"))
+    shutil.copy(os.path.join(zenroot, "x64\Release\zenserver.exe"), os.path.join(target_bin_dir, "zenserver.exe"))
+    shutil.copy(os.path.join(zenroot, "x64\Release\zenserver.pdb"), os.path.join(target_bin_dir, "zenserver.pdb"))
     shutil.copy(os.path.join(zenroot, r'vcpkg_installed\x64-windows-static\tools\sentry-native\crashpad_handler.exe'), crashpadtarget)
     P4.add(crashpadtarget).run()
-    jazz_print("All done and good!")
 except Exception as e:
-    print(f"Noooooo: {e.args}")
-    pass
+    print(f"Caught exception while copying: {e.args}")
+    exit(1)
 
-# scripts\sentry-cli.exe upload-dif --org to --project zen-server x64\release\zenserver.exe x64\release\zenserver.pdb
+jazz_print("SUCCESS", "binaries ready for check-in")