Launchpad itself

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

  1. Git
  2. lp:~cjwatson/launchpad
  3. fix-build-tarball-assets
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 97990c559e9c4a7234c78b2aa238523c432a2abf
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-build-tarball-assets
Merge into: launchpad:master
Diff against target: 26 lines (+2/-2)
2 files modified
Makefile (+1/-1)
utilities/build-tarball (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+441863@code.launchpad.net

Commit message

Move asset build to be local to build-tarball

Description of the change

The `build_wheels_only` target in the `Makefile` is used by both legacy deployments (via a complex chain of systems that include a call to `make build_wheels`) and Juju deployments (via a Jenkins job that calls `make publish-tarball`). We need `make publish-tarball` to build assets in order to support a future charm, but `make build_wheels` can't do so because the legacy build machine doesn't have the right dependencies installed - and we probably don't want to re-engineer those deployments too heavily anyway.

Moving this to the `build-tarball` script and reverting the `Makefile` changes lets us make things work the way they need to for Juju deployments, while fixing legacy deployments.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index a6b86ab..ebacd51 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -278,7 +278,7 @@ requirements/combined.txt: \
6 # dependencies without also building a useless wheel of Launchpad itself;
7 # fortunately that doesn't take too long, and we just remove it afterwards.
8 .PHONY: build_wheels_only
9-build_wheels_only: build
10+build_wheels_only: $(PIP_BIN) requirements/combined.txt
11 $(RM) -r wheelhouse wheels
12 $(SHHH) $(PIP) wheel -w wheels -r requirements/setup.txt
13 $(SHHH) $(PIP) wheel \
14diff --git a/utilities/build-tarball b/utilities/build-tarball
15index 0d4cb88..fcbdc19 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_wheels_only
23+make build build_wheels_only
24
25 # Ensure that we have an updated idea of this tree's version.
26 scripts/update-version-info.sh

Subscribers

People subscribed via source and target branches

to status/vote changes: