zuul
/
zuul
Code Issues Proposed changes

Use zuul/web/static in setup_hook 

The actual location of the files we want to put into the wheel are the
files at zuul/web static. web/build is just a symlink so that the
javascript build system in web/ puts files where we want them without
needing to do build config things.

There is no actual difference - python processes the symlinks just as
well as it processes the direct paths. But from a semantic perspective,
pointing to the paths as they will be in the wheel makes a little more
sense than pointing to paths through a convenience symlink, when trying
to sort out what's going on and why.

Change-Id: Ib93b0eb22f0096b33bcfdb862a47765e48be7203
This commit is contained in:
Monty Taylor 2018-10-11 11:35:08 -05:00
parent 85da9b7c23
commit 733623f328
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zuul/_setup_hook.py
View File

@ -28,7 +28,7 @@ def _build_javascript():
r = subprocess.Popen(['yarn', 'install', '-d'], cwd="web/").wait() r = subprocess.Popen(['yarn', 'install', '-d'], cwd="web/").wait()
if r: if r:
raise RuntimeError("Yarn install failed") raise RuntimeError("Yarn install failed")
if not os.path.exists('web/build/index.html'): if not os.path.exists('zuul/web/static/index.html'):
r = subprocess.Popen(['yarn', 'build'], cwd="web/").wait() r = subprocess.Popen(['yarn', 'build'], cwd="web/").wait()
if r: if r:
raise RuntimeError("Yarn build failed") raise RuntimeError("Yarn build failed")