fix: armv7l should be set as arm for node gyp

Close #2862
electron-userland · May 3, 2018 · d649815 · d649815
1 parent 3763f31
commit d649815
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 18 deletions.
diff --git a/packages/electron-builder-lib/src/util/yarn.ts b/packages/electron-builder-lib/src/util/yarn.ts
@@ -31,10 +31,11 @@ function getElectronGypCacheDir() {
 }
 
 export function getGypEnv(frameworkInfo: DesktopFrameworkInfo, platform: string, arch: string, buildFromSource: boolean) {
+  const npmConfigArch = arch === "armv7l" ? "arm" : arch
   const common = {
     ...process.env,
-    npm_config_arch: arch,
-    npm_config_target_arch: arch,
+    npm_config_arch: npmConfigArch,
+    npm_config_target_arch: npmConfigArch,
     npm_config_platform: platform,
     npm_config_build_from_source: buildFromSource,
     // required for node-pre-gyp

diff --git a/test/out/__snapshots__/BuildTest.js.snap b/test/out/__snapshots__/BuildTest.js.snap
@@ -415,6 +415,16 @@ Object {
             "package.json": Object {
               "size": 774,
             },
+            "src": Object {
+              "files": Object {
+                "async.h": Object {
+                  "size": 1500,
+                },
+                "keytar.h": Object {
+                  "size": 979,
+                },
+              },
+            },
           },
         },
         "lzma-native": Object {
@@ -510,7 +520,7 @@ Object {
                 },
               },
             },
-            "binding-v3.0.1-electron-v1.8-linux-x64": Object {
+            "binding-v3.0.1-electron-v2.0-linux-x64": Object {
               "files": Object {
                 "lzma_native.node": Object {
                   "executable": true,
@@ -3681,6 +3691,9 @@ Object {
                 "index-parser.cpp": Object {
                   "size": 16667,
                 },
+                "index-parser.h": Object {
+                  "size": 7386,
+                },
                 "liblzma-functions.cpp": Object {
                   "size": 2928,
                 },

diff --git a/test/out/linux/__snapshots__/snapTest.js.snap b/test/out/linux/__snapshots__/snapTest.js.snap
@@ -36,7 +36,7 @@ Object {
   "parts": Object {
     "app": Object {
       "after": Array [
-        "desktop-gtk2",
+        "desktop-gtk3",
       ],
       "build-packages": Array [
         "foo1",
@@ -56,7 +56,7 @@ Object {
         "libxtst6",
       ],
     },
-    "desktop-gtk2": Object {
+    "desktop-gtk3": Object {
       "install": "set -x
 export XDG_DATA_DIRS=$SNAPCRAFT_PART_INSTALL/usr/share
 update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime
@@ -228,7 +228,7 @@ Object {
   "parts": Object {
     "app": Object {
       "after": Array [
-        "desktop-gtk2",
+        "desktop-gtk3",
       ],
       "plugin": "nil",
       "stage-packages": Array [
@@ -243,7 +243,7 @@ Object {
         "libxtst6",
       ],
     },
-    "desktop-gtk2": Object {
+    "desktop-gtk3": Object {
       "install": "set -x
 export XDG_DATA_DIRS=$SNAPCRAFT_PART_INSTALL/usr/share
 update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime
@@ -310,7 +310,7 @@ Object {
   "parts": Object {
     "app": Object {
       "after": Array [
-        "desktop-gtk2",
+        "desktop-gtk3",
       ],
       "plugin": "nil",
       "stage-packages": Array [
@@ -326,7 +326,7 @@ Object {
         "custom",
       ],
     },
-    "desktop-gtk2": Object {
+    "desktop-gtk3": Object {
       "install": "set -x
 export XDG_DATA_DIRS=$SNAPCRAFT_PART_INSTALL/usr/share
 update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime
@@ -393,7 +393,7 @@ Object {
   "parts": Object {
     "app": Object {
       "after": Array [
-        "desktop-gtk2",
+        "desktop-gtk3",
       ],
       "plugin": "nil",
       "stage-packages": Array [
@@ -409,7 +409,7 @@ Object {
         "libxtst6",
       ],
     },
-    "desktop-gtk2": Object {
+    "desktop-gtk3": Object {
       "install": "set -x
 export XDG_DATA_DIRS=$SNAPCRAFT_PART_INSTALL/usr/share
 update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime
@@ -477,7 +477,7 @@ Object {
   "parts": Object {
     "app": Object {
       "after": Array [
-        "desktop-gtk2",
+        "desktop-gtk3",
       ],
       "plugin": "nil",
       "stage-packages": Array [
@@ -494,7 +494,7 @@ Object {
         "foo2",
       ],
     },
-    "desktop-gtk2": Object {
+    "desktop-gtk3": Object {
       "install": "set -x
 export XDG_DATA_DIRS=$SNAPCRAFT_PART_INSTALL/usr/share
 update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime
@@ -586,7 +586,7 @@ Object {
   "parts": Object {
     "app": Object {
       "after": Array [
-        "desktop-gtk2",
+        "desktop-gtk3",
       ],
       "plugin": "nil",
       "stage-packages": Array [
@@ -601,7 +601,7 @@ Object {
         "libxtst6",
       ],
     },
-    "desktop-gtk2": Object {
+    "desktop-gtk3": Object {
       "install": "set -x
 export XDG_DATA_DIRS=$SNAPCRAFT_PART_INSTALL/usr/share
 update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime
@@ -662,7 +662,7 @@ Object {
   "parts": Object {
     "app": Object {
       "after": Array [
-        "desktop-gtk2",
+        "desktop-gtk3",
       ],
       "plugin": "nil",
       "stage-packages": Array [
@@ -677,7 +677,7 @@ Object {
         "libxtst6",
       ],
     },
-    "desktop-gtk2": Object {
+    "desktop-gtk3": Object {
       "install": "set -x
 export XDG_DATA_DIRS=$SNAPCRAFT_PART_INSTALL/usr/share
 update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime

diff --git a/test/src/linux/snapTest.ts b/test/src/linux/snapTest.ts
@@ -20,7 +20,7 @@ test.ifAll.ifDevOrLinuxCi("snap", app({
 }))
 
 // very slow
-test("snap full", app({
+test.skip("snap full", app({
   targets: snapTarget,
   config: {
     extraMetadata: {