[tor-commits] [builders/tor-browser-build] branch master updated: Bug 40497: Check that directory does not exist before starting macOS signing

[gitolite role]

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master
in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/master by this push:
     new e94220d  Bug 40497: Check that directory does not exist before starting macOS signing
e94220d is described below

commit e94220d6600b97ced499c6d23b95abbf329a4455
Author: Nicolas Vigier <boklm at torproject.org>
AuthorDate: Mon Jun 6 12:36:58 2022 +0200

    Bug 40497: Check that directory does not exist before starting macOS signing
---
 tools/signing/do-all-signing | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/signing/do-all-signing b/tools/signing/do-all-signing
index dcf6a02..784255c 100755
--- a/tools/signing/do-all-signing
+++ b/tools/signing/do-all-signing
@@ -31,6 +31,18 @@ function sync-builder-unsigned-to-local-signed {
   "$script_dir/sync-builder-unsigned-to-local-signed"
 }
 
+function macos-signer-directory-not-present {
+  # To avoid doing two signings at the same time, or to avoid unknowingly
+  # using parts from a previous signing attempt, we check that the
+  # directory does not exist yet (see tor-browser-build#40497)
+  if ssh "$ssh_host_macos_signer" "test -d $tbb_version"
+  then
+    echo "The directory $tbb_version already exists on $ssh_host_macos_signer"
+    return 1
+  fi
+  return 0
+}
+
 function sync-scripts-to-macos-signer {
   "$script_dir/sync-scripts-to-macos-signer"
 }
@@ -168,6 +180,7 @@ function do_step {
 
 do_step wait-for-finished-build
 do_step sync-builder-unsigned-to-local-signed
+do_step macos-signer-directory-not-present
 do_step sync-scripts-to-macos-signer
 do_step macos-signer-enable-network-proxy-settings
 do_step macos-signer-gatekeeper-signing

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.