From 2f4bb6efab4def66dad1902d61c823421d7bd089 Mon Sep 17 00:00:00 2001 From: develar Date: Wed, 24 Jan 2018 09:06:54 +0100 Subject: [PATCH] chore: update electron to 1.7.11 in tests --- .circleci/config.yml | 6 +++--- .../electron-builder-lib/src/util/NodeModuleCopyHelper.ts | 5 +++-- test/fixtures/test-app-build-sub/electron-builder.yml | 2 +- test/fixtures/test-app-one/package.json | 2 +- .../packages/test-app/package.json | 2 +- .../test-app-yarn-workspace/packages/test-app/package.json | 2 +- test/fixtures/test-app/package.json | 2 +- test/out/mac/__snapshots__/macPackagerTest.js.snap | 2 +- test/src/helpers/testConfig.ts | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a5727d1873..656b3b74a31 100644 --- 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 index 70cf0725c11..a1500d6ed22 100644 --- 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 = [] // 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 index fa7502dada4..037d18ff4d0 100644 --- 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 index 18cbbe54e37..cdbae4c1dc8 100644 --- a/test/fixtures/test-app-one/package.json +++ b/test/fixtures/test-app-one/package.json @@ -8,7 +8,7 @@ "author": "Foo Bar ", "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 index 270c1bb1fad..3bfe2acc5e2 100644 --- 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 ", "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 index 1293560aa03..ea43f94a100 100644 --- 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 ", "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 index 108d16813c1..6893d342aa3 100644 --- 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 index ae83069ac07..3827c64c667 100644 --- 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 index c8f1e551f6c..82b48a2f7ef 100644 --- 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" \ No newline at end of file +export const ELECTRON_VERSION = "1.7.11" \ No newline at end of file