Launchpad itself

Merge ~cjwatson/launchpad:fix-node-sass-versioning into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. fix-node-sass-versioning
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: fc5776447c0745fbb0327d07e593e426e23dedbf
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-node-sass-versioning
Merge into: launchpad:master
Diff against target: 17 lines (+3/-2)
1 file modified
Makefile (+3/-2)
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+384914@code.launchpad.net

Commit message

Fix node-sass versioning

Description of the change

The version was misnamed as 4.14.4 (which doesn't yet exist), and it's useful to support 32-bit development containers as well.

Requires https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/384913.

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
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 2283d58..1f01368 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -49,9 +49,10 @@ YARN_BUILD := $(JS_BUILD_DIR)/yarn
6 YARN := utilities/yarn
7 YUI_SYMLINK := $(JS_BUILD_DIR)/yui
8 LP_JS_BUILD := $(JS_BUILD_DIR)/lp
9+NODE_ARCH = $(call lazy_eval,NODE_ARCH,nodejs -p process.arch)
10 NODE_ABI = $(call lazy_eval,NODE_ABI,nodejs -p process.versions.modules)
11-NODE_SASS_VERSION = 4.14.4
12-NODE_SASS_BINDING = linux-x64-$(NODE_ABI)
13+NODE_SASS_VERSION = 4.14.1
14+NODE_SASS_BINDING = linux-$(NODE_ARCH)-$(NODE_ABI)
15 NODE_SASS_BINARY = $(WD)/download-cache/yarn/node-sass-$(NODE_SASS_VERSION)-$(NODE_SASS_BINDING)_binding.node
16
17 MINS_TO_SHUTDOWN=15

Subscribers

People subscribed via source and target branches

to status/vote changes: