Upload SHASUMS.txt when publishing release

zcbenz · zcbenz · commit 8a418ba34736 · 2015-04-12T00:01:10.000+08:00
diff --git a/script/upload-node-headers.py b/script/upload-node-headers.py
@@ -47,11 +47,6 @@ def main():
   bucket, access_key, secret_key = s3_config()
   upload_node(bucket, access_key, secret_key, args.version)
 
-  # Upload the SHASUMS.txt.
-  execute([sys.executable,
-           os.path.join(SOURCE_ROOT, 'script', 'upload-checksums.py'),
-           '-v', args.version])
-
 
 def parse_args():
   parser = argparse.ArgumentParser(description='upload sumsha file')
@@ -110,8 +105,7 @@ def upload_node(bucket, access_key, secret_key, version):
           'atom-shell/dist/{0}'.format(version), glob.glob('node-*.tar.gz'))
 
   if PLATFORM == 'win32':
-    target_arch = get_target_arch()
-    if target_arch == 'ia32':
+    if get_target_arch() == 'ia32':
       node_lib = os.path.join(DIST_DIR, 'node.lib')
     else:
       node_lib = os.path.join(DIST_DIR, 'x64', 'node.lib')
@@ -125,7 +119,7 @@ def upload_node(bucket, access_key, secret_key, version):
     s3put(bucket, access_key, secret_key, DIST_DIR,
           'atom-shell/dist/{0}'.format(version), [node_lib])
 
-    # Upload the index.json
+    # Upload the index.json.
     with scoped_cwd(SOURCE_ROOT):
       atom_shell = os.path.join(OUT_DIR, 'atom.exe')
       index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
diff --git a/script/upload.py b/script/upload.py
@@ -46,9 +46,22 @@ def main():
     sys.stderr.flush()
     return 1
 
-  # Upload atom-shell with GitHub Releases API.
   github = GitHub(auth_token())
   release_id = create_or_get_release_draft(github, args.version)
+
+  if args.publish_release:
+    # Upload the SHASUMS.txt.
+    execute([sys.executable,
+             os.path.join(SOURCE_ROOT, 'script', 'upload-checksums.py'),
+             '-v', ATOM_SHELL_VERSION])
+
+    # Press the publish button.
+    publish_release(github, release_id)
+
+    # Do not upload other files when passed "-p".
+    return
+
+  # Upload atom-shell with GitHub Releases API.
   upload_atom_shell(github, release_id, os.path.join(DIST_DIR, DIST_NAME))
   upload_atom_shell(github, release_id, os.path.join(DIST_DIR, SYMBOLS_NAME))
 
@@ -67,10 +80,6 @@ def main():
              os.path.join(SOURCE_ROOT, 'script', 'upload-node-headers.py'),
              '-v', ATOM_SHELL_VERSION])
 
-  if args.publish_release:
-    # Press the publish button.
-    publish_release(github, release_id)
-
 
 def parse_args():
   parser = argparse.ArgumentParser(description='upload distribution file')
