From aa835ad38a03090eaa29ba701e22afcbcb8c1707 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Sun, 12 Apr 2015 11:36:55 +0800 Subject: [PATCH] Upload index.json when publishing release --- script/upload-index-json.py | 31 ++++++++++++++++++++++++++ script/upload-node-headers.py | 10 --------- script/upload.py | 4 ++++ {script => tools}/dump-version-info.js | 0 4 files changed, 35 insertions(+), 10 deletions(-) create mode 100755 script/upload-index-json.py rename {script => tools}/dump-version-info.js (100%) diff --git a/script/upload-index-json.py b/script/upload-index-json.py new file mode 100755 index 000000000000..52f441b70194 --- /dev/null +++ b/script/upload-index-json.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python + +import os +import sys + +from lib.config import PLATFORM +from lib.util import execute, s3_config, s3put, scoped_cwd + + +SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) +OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R') + + +def main(): + # Upload the index.json. + with scoped_cwd(SOURCE_ROOT): + atom_shell = os.path.join(OUT_DIR, 'atom') + if PLATFORM == 'win32': + atom_shell += '.exe' + index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json')) + execute([atom_shell, + os.path.join('tools', 'dump-version-info.js'), + index_json]) + + bucket, access_key, secret_key = s3_config() + s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist', + [index_json]) + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/script/upload-node-headers.py b/script/upload-node-headers.py index a2b9894382d0..136da07d938b 100755 --- a/script/upload-node-headers.py +++ b/script/upload-node-headers.py @@ -119,16 +119,6 @@ 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. - 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')) - execute([atom_shell, - os.path.join('script', 'dump-version-info.js'), - index_json]) - s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist', - [index_json]) - if __name__ == '__main__': sys.exit(main()) diff --git a/script/upload.py b/script/upload.py index 692d506be2fe..9cf0f04f3d72 100755 --- a/script/upload.py +++ b/script/upload.py @@ -55,6 +55,10 @@ def main(): os.path.join(SOURCE_ROOT, 'script', 'upload-checksums.py'), '-v', ATOM_SHELL_VERSION]) + # Upload the index.json. + execute([sys.executable, + os.path.join(SOURCE_ROOT, 'script', 'upload-index-json.py')]) + # Press the publish button. publish_release(github, release_id) diff --git a/script/dump-version-info.js b/tools/dump-version-info.js similarity index 100% rename from script/dump-version-info.js rename to tools/dump-version-info.js