Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 0254e9e

Browse files
committed
Merge pull request #64 from eseidelGoogle/red_button
Fix big_red_button in its new home.
2 parents 54f3ba4 + a832154 commit 0254e9e

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

sky/tools/big_red_button.py

+13-11
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import distutils.util
2020

2121

22-
DEFAULT_MOJO_ROOT = '/src/mojo/src'
22+
DEFAULT_SKY_ENGINE_ROOT = '/src/sky_engine/src'
2323
DEFAULT_SKY_SDK_ROOT = '/src/sky_sdk'
2424
DEFAULT_DEMO_SITE_ROOT = '/src/domokit.github.io'
2525
CONFIRM_MESSAGE = """This tool is destructive and will revert your current branch to
@@ -52,8 +52,8 @@ def publish_packages(pub_path, packages_root):
5252

5353
def main():
5454
parser = argparse.ArgumentParser(description='Deploy!')
55-
parser.add_argument('--mojo-root', help='Path to mojo/src',
56-
default=DEFAULT_MOJO_ROOT)
55+
parser.add_argument('--sky-engine-root', help='Path to sky_engine/src',
56+
default=DEFAULT_SKY_ENGINE_ROOT)
5757
parser.add_argument('--sky-sdk-root', help='Path to sky_sdk',
5858
default=DEFAULT_SKY_SDK_ROOT)
5959
parser.add_argument('--demo-site-root', help='Path to domokit.github.io',
@@ -71,24 +71,25 @@ def main():
7171
print "Aborted."
7272
return 1
7373

74-
mojo_root = os.path.abspath(os.path.expanduser(args.mojo_root))
74+
sky_engine_root = os.path.abspath(os.path.expanduser(args.sky_engine_root))
7575
sky_sdk_root = os.path.abspath(os.path.expanduser(args.sky_sdk_root))
7676
demo_site_root = os.path.abspath(os.path.expanduser(args.demo_site_root))
7777

7878
# Derived paths:
79-
dart_sdk_root = os.path.join(mojo_root, 'third_party/dart-sdk/dart-sdk')
79+
dart_sdk_root = os.path.join(sky_engine_root, 'third_party/dart-sdk/dart-sdk')
8080
pub_path = os.path.join(dart_sdk_root, 'bin/pub')
8181
packages_root = os.path.join(sky_sdk_root, 'packages')
8282

83-
run(mojo_root, ['git', 'pull', '--rebase'])
84-
run(mojo_root, ['gclient', 'sync'])
85-
run(mojo_root, ['mojo/tools/mojob.py', 'gn', '--android', '--release'])
86-
run(mojo_root, ['mojo/tools/mojob.py', 'build', '--android', '--release'])
83+
run(sky_engine_root, ['git', 'pull', '--rebase'])
84+
run(sky_engine_root, ['gclient', 'sync'])
85+
run(sky_engine_root, ['sky/tools/gn', 'gn', '--android', '--release'])
86+
# TODO(eseidel): We shouldn't use mojob anymore, it likely will break.
87+
run(sky_engine_root, ['mojo/tools/mojob.py', 'build', '--android', '--release'])
8788
# Run tests?
8889

8990
run(sky_sdk_root, ['git', 'fetch'])
9091
run(sky_sdk_root, ['git', 'reset', '--hard', 'origin/master'])
91-
run(mojo_root, [
92+
run(sky_engine_root, [
9293
'sky/tools/deploy_sdk.py',
9394
'--non-interactive',
9495
'--commit',
@@ -98,7 +99,8 @@ def main():
9899

99100
run(demo_site_root, ['git', 'fetch'])
100101
run(demo_site_root, ['git', 'reset', '--hard', 'origin/master'])
101-
run(mojo_root, ['mojo/tools/deploy_domokit_site.py', demo_site_root])
102+
# TODO(eseidel): We should move this script back into sky/tools.
103+
run(sky_engine_root, ['mojo/tools/deploy_domokit_site.py', demo_site_root])
102104
# tag for version?
103105

104106
if args.publish:

0 commit comments

Comments
 (0)