From 8d4be6ab57db857bc07c40be6adcffb3d8ebc882 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 10 Jul 2014 14:17:46 -0700 Subject: [PATCH 1/3] Install apm in 32-bit mode on Windows CI --- script/bootstrap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/bootstrap b/script/bootstrap index 28bccd663..16f8b7848 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -57,6 +57,9 @@ function bootstrap() { apmInstallOptions.ignoreStdout = true; } + if (process.env.JANKY_SHA1 && process.platform === 'win32') + apmInstallCommand += ' --arch=ia32'; + var commands = [ { command: buildInstallCommand, From defa869d5c4c30754485a33cf60038e70e29ba6e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 10 Jul 2014 17:24:11 -0700 Subject: [PATCH 2/3] Upgrade to apm@0.76 --- apm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm/package.json b/apm/package.json index a4085230a..4ba24d6a6 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "0.75.0" + "atom-package-manager": "0.76.0" } } From b11accec6d78aab8a84a694ff1d43e260b052bc3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 10 Jul 2014 17:28:15 -0700 Subject: [PATCH 3/3] :memo: Doc --arch=ia32 flag --- script/bootstrap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/bootstrap b/script/bootstrap index 16f8b7848..f286096a6 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -57,6 +57,8 @@ function bootstrap() { apmInstallOptions.ignoreStdout = true; } + // apm ships with 32-bit node so make sure its native modules are compiled + // for a 32-bit target architecture if (process.env.JANKY_SHA1 && process.platform === 'win32') apmInstallCommand += ' --arch=ia32';