Merge ~cjwatson/launchpad:revert-build-tarball-assets into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: c1e30bc3fcafc1c9a2c1fd57751099b74ae9017a
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:revert-build-tarball-assets
Merge into: launchpad:master
Diff against target: 41 lines (+2/-10)
2 files modified
ols-vms.conf (+1/-1)
utilities/build-tarball (+1/-9)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+441878@code.launchpad.net

Commit message

Revert "Include built assets in deployment tarballs"

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ols-vms.conf b/ols-vms.conf
2index 0ff80f3..bad8b0b 100644
3--- a/ols-vms.conf
4+++ b/ols-vms.conf
5@@ -3,7 +3,7 @@ vm.architecture = amd64
6 vm.release = focal
7
8 apt.sources = ppa:launchpad/ppa
9-vm.packages = launchpad-frontend-dependencies
10+vm.packages = launchpad-dependencies
11
12 [launchpad]
13 vm.class = lxd
14diff --git a/utilities/build-tarball b/utilities/build-tarball
15index fcbdc19..22cba4a 100755
16--- a/utilities/build-tarball
17+++ b/utilities/build-tarball
18@@ -16,7 +16,7 @@ output_dir="$1"
19 # the Makefile and also has to call out to the Makefile, but this is
20 # difficult to disentangle until we refactor our build system to use
21 # something higher-level than pip.
22-make build build_wheels_only
23+make build_wheels_only
24
25 # Ensure that we have an updated idea of this tree's version.
26 scripts/update-version-info.sh
27@@ -33,14 +33,6 @@ mkdir -p "$output_dir"
28 echo ./version-info.py
29 echo ./version-info.txt
30 find ./wheels/ -name \*.whl -print
31- # We include assets (API documentation, CSS, and JavaScript); only some
32- # deployments need these, but including them in the tarball anyway is
33- # relatively cheap, and they'd otherwise take some time to build during
34- # rollouts.
35- find ./lib/canonical/launchpad/apidoc/ -not -type d -print
36- find ./yarn/node_modules/yui/ -not -type d -print
37- find ./lib/canonical/launchpad/icing/ -not -type d -print
38- find ./build/js/ -not -type d -print
39 ) | sort >"$output_dir/.files"
40
41 # Create the tarball.

Subscribers

People subscribed via source and target branches

to status/vote changes: