MAAS

Merge ~adam-collard/maas:quieter-download-of-node-and-yarn into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. quieter-download-of-node-and-yarn
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 87580be695d1b22cc06d83ac5227f13fa1590ea6
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:quieter-download-of-node-and-yarn
Merge into: maas:master
Diff against target: 21 lines (+2/-2)
1 file modified
src/maasui/Makefile (+2/-2)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Alexsander de Souza Approve
Review via email: mp+416045@code.launchpad.net

Commit message

Quieten down the fetching of node and yarn binaries

wget has a -nv flag (--no-verbose) which "turns off verbose without being completely quiet"

To post a comment you must log in.
Revision history for this message
Alexsander de Souza (alexsander-souza) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b quieter-download-of-node-and-yarn lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11918/consoleText

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b quieter-download-of-node-and-yarn lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 87580be695d1b22cc06d83ac5227f13fa1590ea6

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasui/Makefile b/src/maasui/Makefile
2index 2e95548..3396106 100644
3--- a/src/maasui/Makefile
4+++ b/src/maasui/Makefile
5@@ -26,14 +26,14 @@ $(NODEJS_DIR):
6 mkdir -p $@
7
8 $(NODEJS_TARBALL): $(NODEJS_DIR)
9- wget -O $(NODEJS_TARBALL) https://nodejs.org/dist/v$(NODEJS_VERSION)/node-v$(NODEJS_VERSION)-linux-x64.tar.xz
10+ wget -nv -O $(NODEJS_TARBALL) https://nodejs.org/dist/v$(NODEJS_VERSION)/node-v$(NODEJS_VERSION)-linux-x64.tar.xz
11
12 $(NODEJS_BIN)/node: $(NODEJS_TARBALL)
13 tar -C $(NODEJS_DIR) -xf $< --strip-components=1
14 @touch --no-create $@
15
16 $(YARN_TARBALL): $(NODEJS_DIR)
17- wget -O $@ https://github.com/yarnpkg/yarn/releases/download/v$(YARN_VERSION)/yarn-v$(YARN_VERSION).tar.gz
18+ wget -nv -O $@ https://github.com/yarnpkg/yarn/releases/download/v$(YARN_VERSION)/yarn-v$(YARN_VERSION).tar.gz
19
20 $(NODEJS_BIN)/yarn: $(YARN_TARBALL) $(NODEJS_BIN)/node
21 tar -C $(NODEJS_DIR) -xf $< --strip-components=1

Subscribers

People subscribed via source and target branches