From eb7b18b38e01688b5b05e5dfdb359ff5d42d1ed8 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 4 Jun 2019 09:56:57 -0700 Subject: [PATCH] Revert "Create zuul/web/static on demand" This reverts commit 64e2bc8ba8c3123f0fc8170f0b51e09de6e515b1. This appears to have broken js content tarball generation: http://zuul.openstack.org/build/f26dc90f339a4359a5cf93a3b0edb96f Change-Id: I3d4928aeba8449702ba7484cb6b679433b10cbeb --- tools/pip.sh | 1 - zuul/_setup_hook.py | 1 - zuul/web/static/.keep | 0 3 files changed, 2 deletions(-) create mode 100644 zuul/web/static/.keep diff --git a/tools/pip.sh b/tools/pip.sh index 489bdf9107..a8474d77e1 100755 --- a/tools/pip.sh +++ b/tools/pip.sh @@ -32,7 +32,6 @@ then fi if [[ ! -f zuul/web/static/status.html ]] then - mkdir -p zuul/web/static pushd web/ yarn install yarn build diff --git a/zuul/_setup_hook.py b/zuul/_setup_hook.py index 945b9141d4..d88815c36f 100644 --- a/zuul/_setup_hook.py +++ b/zuul/_setup_hook.py @@ -29,7 +29,6 @@ def _build_javascript(): if r: raise RuntimeError("Yarn install failed") if not os.path.exists('zuul/web/static/index.html'): - os.makedirs('zuul/web/static', exist_ok=True) r = subprocess.Popen(['yarn', 'build'], cwd="web/").wait() if r: raise RuntimeError("Yarn build failed") diff --git a/zuul/web/static/.keep b/zuul/web/static/.keep new file mode 100644 index 0000000000..e69de29bb2