launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-node-sass-versioning into launchpad:master.

Commit message:
Fix node-sass versioning

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-node-sass-versioning into launchpad:master.

diff --git a/Makefile b/Makefile
index 2283d58..1f01368 100644
--- a/Makefile
+++ b/Makefile
@@ -49,9 +49,10 @@ YARN_BUILD := $(JS_BUILD_DIR)/yarn
 YARN := utilities/yarn
 YUI_SYMLINK := $(JS_BUILD_DIR)/yui
 LP_JS_BUILD := $(JS_BUILD_DIR)/lp
+NODE_ARCH = $(call lazy_eval,NODE_ARCH,nodejs -p process.arch)
 NODE_ABI = $(call lazy_eval,NODE_ABI,nodejs -p process.versions.modules)
-NODE_SASS_VERSION = 4.14.4
-NODE_SASS_BINDING = linux-x64-$(NODE_ABI)
+NODE_SASS_VERSION = 4.14.1
+NODE_SASS_BINDING = linux-$(NODE_ARCH)-$(NODE_ABI)
 NODE_SASS_BINARY = $(WD)/download-cache/yarn/node-sass-$(NODE_SASS_VERSION)-$(NODE_SASS_BINDING)_binding.node
 
 MINS_TO_SHUTDOWN=15