chore: update electron to 1.7.11 in tests

electron-userland · Jan 24, 2018 · 2f4bb6e · 2f4bb6e
1 parent 2347623
commit 2f4bb6e
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
               - dependencies-{{ checksum "yarn.lock" }}
         - restore_cache:
             keys:
-              - v-1.7.8-electron
+              - v-1.7.11-electron
         - run:
             command: yarn
         - run:
@@ -23,7 +23,7 @@ jobs:
         - run:
             command: node ./test/out/helpers/downloadElectron.js
         - save_cache:
-            key: v-1.7.8-electron
+            key: v-1.7.11-electron
             paths:
               - ~/.cache/electron
 
@@ -41,7 +41,7 @@ jobs:
               - dependencies-{{ checksum "yarn.lock" }}
         - restore_cache:
             keys:
-              - v-1.7.8-electron
+              - v-1.7.11-electron
         # because in the build job we use circleci docker image and circleci restores cache to original user home
         - run:
             command: |

diff --git a/packages/electron-builder-lib/src/util/NodeModuleCopyHelper.ts b/packages/electron-builder-lib/src/util/NodeModuleCopyHelper.ts
@@ -6,7 +6,7 @@ import { excludedNames, FileMatcher } from "../fileMatcher"
 import { Packager } from "../packager"
 import { Dependency } from "./packageDependencies"
 
-const excludedFiles = new Set([".DS_Store", "node_modules" /* already in the queue */, "CHANGELOG.md", "ChangeLog", "changelog.md", "binding.gyp"].concat(excludedNames.split(",")))
+const excludedFiles = new Set([".DS_Store", "node_modules" /* already in the queue */, "CHANGELOG.md", "ChangeLog", "changelog.md", "binding.gyp", ".npmignore"].concat(excludedNames.split(",")))
 const topLevelExcludedFiles = new Set(["karma.conf.js", ".coveralls.yml", "README.md", "readme.markdown", "README", "readme.md", "readme", "test", "__tests__", "tests", "powered-test", "example", "examples"])
 
 /** @internal */
@@ -76,7 +76,8 @@ export class NodeModuleCopyHelper {
         const dirs: Array<string> = []
         // our handler is async, but we should add sorted files, so, we add file to result not in the mapper, but after map
         const sortedFilePaths = await BluebirdPromise.map(childNames, name => {
-          if (excludedFiles.has(name) || name.endsWith(".h") || name.endsWith(".o") || name.endsWith(".obj") || name.endsWith(".cc") || (!isIncludePdb && name.endsWith(".pdb")) || name.endsWith(".d.ts") || name.endsWith(".suo") || name.endsWith(".npmignore") || name.endsWith(".sln")) {
+          if (excludedFiles.has(name) || name.endsWith(".h") || name.endsWith(".o") || name.endsWith(".obj") || name.endsWith(".cc") || (!isIncludePdb && name.endsWith(".pdb")) || name.endsWith(".d.ts") ||
+            name.endsWith(".suo") || name.endsWith(".sln") || name.endsWith(".xproj") || name.endsWith(".csproj")) {
             return null
           }
 

diff --git a/test/fixtures/test-app-build-sub/electron-builder.yml b/test/fixtures/test-app-build-sub/electron-builder.yml
@@ -1,4 +1,4 @@
-electronVersion: 1.7.8
+electronVersion: 1.7.11
 appId: org.electron-builder.testApp
 compression: store
 npmRebuild: false

diff --git a/test/fixtures/test-app-one/package.json b/test/fixtures/test-app-one/package.json
@@ -8,7 +8,7 @@
   "author": "Foo Bar <[email protected]>",
   "license": "MIT",
   "build": {
-    "electronVersion": "1.7.8",
+    "electronVersion": "1.7.11",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

diff --git a/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json b/test/fixtures/test-app-yarn-several-workspace/packages/test-app/package.json
@@ -7,7 +7,7 @@
   "author": "Foo Bar <[email protected]>",
   "license": "MIT",
   "build": {
-    "electronVersion": "1.7.8",
+    "electronVersion": "1.7.11",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

diff --git a/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json b/test/fixtures/test-app-yarn-workspace/packages/test-app/package.json
@@ -7,7 +7,7 @@
   "author": "Foo Bar <[email protected]>",
   "license": "MIT",
   "build": {
-    "electronVersion": "1.7.8",
+    "electronVersion": "1.7.11",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

diff --git a/test/fixtures/test-app/package.json b/test/fixtures/test-app/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "build": {
-    "electronVersion": "1.7.8",
+    "electronVersion": "1.7.11",
     "appId": "org.electron-builder.testApp",
     "compression": "store",
     "npmRebuild": false,

diff --git a/test/out/mac/__snapshots__/macPackagerTest.js.snap b/test/out/mac/__snapshots__/macPackagerTest.js.snap
@@ -57,7 +57,7 @@ Object {
 exports[`one-package 2`] = `
 Object {
   "AsarIntegrity": "{\\"checksums\\":{\\"app.asar\\":\\"hash\\",\\"electron.asar\\":\\"hash\\"}}",
-  "BuildMachineOSBuild": "16G29",
+  "BuildMachineOSBuild": "16G1114",
   "CFBundleDisplayName": "Test App ßW",
   "CFBundleDocumentTypes": Array [
     Object {

diff --git a/test/src/helpers/testConfig.ts b/test/src/helpers/testConfig.ts
@@ -5,4 +5,4 @@
 docker: Error response from daemon: Mounts denied: o Docker.
       You can configure shared paths from Docker -> Preferences... -> File Sharing.
  */
-export const ELECTRON_VERSION = "1.7.8"
+export const ELECTRON_VERSION = "1.7.11"