fix(snap): Snap builds do not have architectures key

Close #2596
electron-userland · Feb 20, 2018 · f799062 · f799062
1 parent 24f2565
commit f799062
Show file tree

Hide file tree

Showing 7 changed files with 162 additions and 130 deletions.
diff --git a/package.json b/package.json
@@ -29,10 +29,10 @@
   "////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
   "dependencies": {
     "7zip-bin": "~3.1.0",
-    "app-builder-bin": "1.3.5",
+    "app-builder-bin": "1.3.6",
     "archiver": "^2.1.1",
     "async-exit-hook": "^2.0.1",
-    "aws-sdk": "^2.197.0",
+    "aws-sdk": "^2.198.0",
     "bluebird-lst": "^1.0.5",
     "chalk": "^2.3.0",
     "chromium-pickle-js": "^0.2.0",
@@ -95,7 +95,7 @@
     "gitbook-plugin-github": "^2.0.0",
     "gitbook-plugin-github-buttons": "^3.0.0",
     "globby": "^8.0.1",
-    "jest-cli": "^22.3.0",
+    "jest-cli": "^22.4.0",
     "jest-junit": "^3.6.0",
     "jsdoc-to-markdown": "^4.0.1",
     "path-sort": "^0.1.0",

diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json
@@ -11,7 +11,7 @@
     "out"
   ],
   "dependencies": {
-    "app-builder-bin": "1.3.5",
+    "app-builder-bin": "1.3.6",
     "temp-file": "^3.1.1",
     "fs-extra-p": "^4.5.2",
     "is-ci": "^1.1.0",

diff --git a/packages/electron-builder-lib/package.json b/packages/electron-builder-lib/package.json
@@ -42,7 +42,7 @@
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
     "7zip-bin": "~3.1.0",
-    "app-builder-bin": "1.3.5",
+    "app-builder-bin": "1.3.6",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.5",
     "chromium-pickle-js": "^0.2.0",

diff --git a/packages/electron-builder-lib/src/targets/snap.ts b/packages/electron-builder-lib/src/targets/snap.ts
@@ -49,6 +49,7 @@ export default class SnapTarget extends Target {
       description: this.helper.getDescription(options),
       confinement: options.confinement || "strict",
       grade: options.grade || "stable",
+      architectures: [toLinuxArchString(arch)],
       apps: {
         [snapName]: {
           command: `bin/desktop-launch $SNAP/app/${this.packager.executableName}`,

diff --git a/packages/electron-publisher-s3/package.json b/packages/electron-publisher-s3/package.json
@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "fs-extra-p": "^4.5.2",
-    "aws-sdk": "^2.197.0",
+    "aws-sdk": "^2.198.0",
     "mime": "^2.2.0",
     "electron-publish": "~0.0.0-semantic-release",
     "builder-util": "^0.0.0-semantic-release",

diff --git a/test/out/linux/__snapshots__/snapTest.js.snap b/test/out/linux/__snapshots__/snapTest.js.snap
@@ -25,6 +25,9 @@ Object {
       ],
     },
   },
+  "architectures": Array [
+    "amd64",
+  ],
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -91,6 +94,9 @@ Object {
       ],
     },
   },
+  "architectures": Array [
+    "amd64",
+  ],
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -131,6 +137,9 @@ Object {
       ],
     },
   },
+  "architectures": Array [
+    "amd64",
+  ],
   "confinement": "classic",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -192,6 +201,9 @@ Object {
       ],
     },
   },
+  "architectures": Array [
+    "amd64",
+  ],
   "confinement": "classic",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -254,6 +266,9 @@ Object {
       ],
     },
   },
+  "architectures": Array [
+    "amd64",
+  ],
   "confinement": "classic",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -317,6 +332,9 @@ Object {
       ],
     },
   },
+  "architectures": Array [
+    "amd64",
+  ],
   "confinement": "classic",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -371,6 +389,9 @@ Object {
       ],
     },
   },
+  "architectures": Array [
+    "amd64",
+  ],
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -429,6 +450,9 @@ Object {
       ],
     },
   },
+  "architectures": Array [
+    "amd64",
+  ],
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",