launchpad-reviewers team mailing list archive

[Colin Watson <mp+441878@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:revert-build-tarball-assets into launchpad:master.

Commit message:
Revert "Include built assets in deployment tarballs"

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/441878

This reverts commits 58bc1d894a8d5f7e17b643d11d8c54185eb010f8 and 97990c559e9c4a7234c78b2aa238523c432a2abf.  It turns out that it's impossible to include assets in deployment tarballs, because API documentation includes the API host name and so needs to be built separately for each environment.  We'll need to take a different approach here.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:revert-build-tarball-assets into launchpad:master.

diff --git a/ols-vms.conf b/ols-vms.conf
index 0ff80f3..bad8b0b 100644
--- a/ols-vms.conf
+++ b/ols-vms.conf
@@ -3,7 +3,7 @@ vm.architecture = amd64
 vm.release = focal
 
 apt.sources = ppa:launchpad/ppa
-vm.packages = launchpad-frontend-dependencies
+vm.packages = launchpad-dependencies
 
 [launchpad]
 vm.class = lxd
diff --git a/utilities/build-tarball b/utilities/build-tarball
index fcbdc19..22cba4a 100755
--- a/utilities/build-tarball
+++ b/utilities/build-tarball
@@ -16,7 +16,7 @@ output_dir="$1"
 # the Makefile and also has to call out to the Makefile, but this is
 # difficult to disentangle until we refactor our build system to use
 # something higher-level than pip.
-make build build_wheels_only
+make build_wheels_only
 
 # Ensure that we have an updated idea of this tree's version.
 scripts/update-version-info.sh
@@ -33,14 +33,6 @@ mkdir -p "$output_dir"
     echo ./version-info.py
     echo ./version-info.txt
     find ./wheels/ -name \*.whl -print
-    # We include assets (API documentation, CSS, and JavaScript); only some
-    # deployments need these, but including them in the tarball anyway is
-    # relatively cheap, and they'd otherwise take some time to build during
-    # rollouts.
-    find ./lib/canonical/launchpad/apidoc/ -not -type d -print
-    find ./yarn/node_modules/yui/ -not -type d -print
-    find ./lib/canonical/launchpad/icing/ -not -type d -print
-    find ./build/js/ -not -type d -print
 ) | sort >"$output_dir/.files"
 
 # Create the tarball.