From d1182b11292653a20129547adb3045d72d59159b Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Mon, 26 Feb 2018 09:21:34 -0700
Subject: [PATCH] Fix macOS builds - Add extra logging to upload.py - Don't
 upload via electron-builder - update logging in cibuild for run_script (print
 details about error that happened)

Auditors: @petemill
---
 tools/buildInstaller.js | 3 ++-
 tools/cibuild.py        | 7 ++++++-
 tools/upload.py         | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/tools/buildInstaller.js b/tools/buildInstaller.js
index 33964e81ccd..1f3c045d667 100644
--- a/tools/buildInstaller.js
+++ b/tools/buildInstaller.js
@@ -128,7 +128,8 @@ if (isDarwin) {
     'cd ..',
     'build ' +
       `--prepackaged="${buildDir}/${appName}.app" ` +
-      `--config=res/${channel}/builderConfig.json `,
+      `--config=res/${channel}/builderConfig.json ` +
+      '--publish=never',
 
     // Create an update zip
     'ditto -c -k --sequesterRsrc --keepParent ' + buildDir + `/${appName}.app dist/${appName}-` + VersionInfo.braveVersion + '.zip'
diff --git a/tools/cibuild.py b/tools/cibuild.py
index ad5f8f31a72..a9f93ef21a0 100755
--- a/tools/cibuild.py
+++ b/tools/cibuild.py
@@ -37,7 +37,12 @@ def run_script(script, args=[]):
   sys.stderr.write('\nRunning ' + script +'\n')
   sys.stderr.flush()
   script = os.path.join(SOURCE_ROOT, 'tools', script)
-  subprocess.check_call([sys.executable, script] + args)
+  try:
+    output = subprocess.check_output([sys.executable, script] + args, stderr=subprocess.STDOUT)
+    print output
+  except subprocess.CalledProcessError as e:
+    print e.output
+    raise e
 
 
 PLATFORM = {
diff --git a/tools/upload.py b/tools/upload.py
index 4a60b6633bd..5744c8abff1 100755
--- a/tools/upload.py
+++ b/tools/upload.py
@@ -9,6 +9,7 @@
 TARGET_ARCH= os.environ['TARGET_ARCH'] if os.environ.has_key('TARGET_ARCH') else 'x64'
 
 def main():
+  print('Running upload...')
   github = GitHub(auth_token())
   releases = github.repos(BROWSER_LAPTOP_REPO).releases.get()
   tag = 'v' + json.load(open('package.json'))['version']
@@ -20,7 +21,7 @@ def main():
   release = create_or_get_release_draft(github, releases, tag,
                                         tag_exists)
   for f in get_files_to_upload():
-    upload_browser_laptop(github,release, f)
+    upload_browser_laptop(github, release, f)
 
 def get_channel_display_name():
   d = {'dev': 'Release', 'beta': 'Beta', 'developer': 'Developer', 'nightly': 'Nightly'}
@@ -36,6 +37,7 @@ def get_files_to_upload():
 
 def upload_browser_laptop(github, release, file_path):
   filename = os.path.basename(file_path)
+  print('upload_browser_laptop: ' + filename)
   try:
     for asset in release['assets']:
       if asset['name'] == filename: