From 9432cb2b641d6371421e672034301c209f5e3e8b Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Fri, 31 Jul 2015 10:41:24 -0700 Subject: [PATCH 1/3] Add a --stage-two to big_red_button.py --- sky/tools/big_red_button.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sky/tools/big_red_button.py b/sky/tools/big_red_button.py index 1a84759af10..e1fdc93c545 100755 --- a/sky/tools/big_red_button.py +++ b/sky/tools/big_red_button.py @@ -76,6 +76,8 @@ def upload_artifacts(dist_root, config, commit_hash): def main(): parser = argparse.ArgumentParser(description='Deploy!') parser.add_argument('sky_engine_root', help='Path to sky_engine/src') + parser.add_argument('--stage-two', action='store_true', default=False, + help='Publish the sky package and upload the binaries') parser.add_argument('--dry-run', action='store_true', default=False, help='Just print commands w/o executing.') parser.add_argument('--no-pub-publish', dest='publish', @@ -114,13 +116,15 @@ def main(): run(sky_engine_root, ['cp', 'AUTHORS', 'LICENSE', sky_package_root]) - upload_artifacts(android_dist_root, 'android-arm', commit_hash) - upload_artifacts(linux_dist_root, 'linux-x64', commit_hash) + if args.stage_two: + upload_artifacts(android_dist_root, 'android-arm', commit_hash) + upload_artifacts(linux_dist_root, 'linux-x64', commit_hash) if args.publish: run(sky_engine_package_root, [pub_path, 'publish', '--force']) run(sky_services_package_root, [pub_path, 'publish', '--force']) - run(sky_package_root, [pub_path, 'publish', '--force']) + if args.stage_two: + run(sky_package_root, [pub_path, 'publish', '--force']) if __name__ == '__main__': From 82fca35f7e85b3451138d6f2dc7893270d2ea349 Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Fri, 31 Jul 2015 10:42:16 -0700 Subject: [PATCH 2/3] whitespace --- sky/tools/big_red_button.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sky/tools/big_red_button.py b/sky/tools/big_red_button.py index e1fdc93c545..33026b218cb 100755 --- a/sky/tools/big_red_button.py +++ b/sky/tools/big_red_button.py @@ -117,14 +117,14 @@ def main(): run(sky_engine_root, ['cp', 'AUTHORS', 'LICENSE', sky_package_root]) if args.stage_two: - upload_artifacts(android_dist_root, 'android-arm', commit_hash) - upload_artifacts(linux_dist_root, 'linux-x64', commit_hash) + upload_artifacts(android_dist_root, 'android-arm', commit_hash) + upload_artifacts(linux_dist_root, 'linux-x64', commit_hash) if args.publish: run(sky_engine_package_root, [pub_path, 'publish', '--force']) run(sky_services_package_root, [pub_path, 'publish', '--force']) if args.stage_two: - run(sky_package_root, [pub_path, 'publish', '--force']) + run(sky_package_root, [pub_path, 'publish', '--force']) if __name__ == '__main__': From 414da6628ec1f5cc9d25dcd6151f0ea9ae4f99ef Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Fri, 31 Jul 2015 10:43:52 -0700 Subject: [PATCH 3/3] Continue to upload binaries as part of stage 1 --- sky/tools/big_red_button.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sky/tools/big_red_button.py b/sky/tools/big_red_button.py index 33026b218cb..dbd28aff87b 100755 --- a/sky/tools/big_red_button.py +++ b/sky/tools/big_red_button.py @@ -77,7 +77,7 @@ def main(): parser = argparse.ArgumentParser(description='Deploy!') parser.add_argument('sky_engine_root', help='Path to sky_engine/src') parser.add_argument('--stage-two', action='store_true', default=False, - help='Publish the sky package and upload the binaries') + help='Publish the sky package') parser.add_argument('--dry-run', action='store_true', default=False, help='Just print commands w/o executing.') parser.add_argument('--no-pub-publish', dest='publish', @@ -116,9 +116,8 @@ def main(): run(sky_engine_root, ['cp', 'AUTHORS', 'LICENSE', sky_package_root]) - if args.stage_two: - upload_artifacts(android_dist_root, 'android-arm', commit_hash) - upload_artifacts(linux_dist_root, 'linux-x64', commit_hash) + upload_artifacts(android_dist_root, 'android-arm', commit_hash) + upload_artifacts(linux_dist_root, 'linux-x64', commit_hash) if args.publish: run(sky_engine_package_root, [pub_path, 'publish', '--force'])