test: attempt to make Win CI green

electron-userland · Dec 14, 2016 · d815b60 · d815b60
1 parent 2900ea9
commit d815b60
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,7 @@ before_install:
 install:
 - nvm install $NODE_VERSION
 - nvm use --delete-prefix $NODE_VERSION
+- if [[ "$TRAVIS_OS_NAME" == "osx" && "$NODE_VERSION" == "6" ]]; then npm install npm -g ; fi
 - mkdir -p ~/Library/Caches/Yarn
 - ln -sf $PWD/test/yarn.js /usr/local/bin/yarn
 - yarn install --pure-lockfile

diff --git a/package.json b/package.json
@@ -59,15 +59,15 @@
   "dependencies": {
     "7zip-bin": "^2.0.4",
     "ansi-escapes": "^1.4.0",
-    "archiver": "^1.2.0",
+    "archiver": "^1.3.0",
     "archiver-utils": "^1.3.0",
     "asar-electron-builder": "^0.13.5",
     "bluebird-lst-c": "^1.0.5",
     "chalk": "^1.1.3",
     "chromium-pickle-js": "^0.2.0",
     "cli-cursor": "^1.0.2",
     "cuint": "^0.2.2",
-    "debug": "^2.3.3",
+    "debug": "2.3.3",
     "electron-download-tf": "3.1.0",
     "electron-macos-sign": "^1.3.4",
     "fs-extra-p": "^3.0.3",
@@ -97,7 +97,7 @@
     "yargs": "^6.5.0"
   },
   "devDependencies": {
-    "@develar/semantic-release": "^6.3.24",
+    "@develar/semantic-release": "^6.3.25",
     "@types/ini": "^1.3.29",
     "@types/jest": "^16.0.1",
     "@types/js-yaml": "^3.5.28",

diff --git a/test/jestSetup.js b/test/jestSetup.js
@@ -30,6 +30,7 @@ else {
 }
 
 test.ifNotCiMac = isCi && process.platform === "darwin" ? skip : test
+test.ifNotCiWin = isCi && isWindows ? skip : test
 
 test.ifDevOrWinCi = !isCi || isWindows ? test : skip
 test.ifDevOrLinuxCi = !isCi || process.platform === "linux" ? test : skip

diff --git a/test/src/filesTest.ts b/test/src/filesTest.ts
@@ -31,7 +31,7 @@ test.ifDevOrLinuxCi("files", app({
   },
 }))
 
-test("extraResources", async () => {
+test.ifNotCiWin("extraResources", async () => {
   for (const platform of getPossiblePlatforms().keys()) {
     const osName = platform.buildConfigurationKey
     const winDirPrefix = "lib/net45/resources/"
@@ -96,7 +96,7 @@ test("extraResources", async () => {
   }
 })
 
-test("extraResources - one-package", () => {
+test.ifNotCiWin("extraResources - one-package", () => {
   const platform = process.platform === "win32" ? Platform.WINDOWS : Platform.LINUX
   const osName = platform.buildConfigurationKey
 

diff --git a/test/typings/jest-ex.d.ts b/test/typings/jest-ex.d.ts
@@ -5,6 +5,7 @@ declare module jest {
     ifNotCi: jest.It
     ifCi: jest.It
     ifNotCiMac: jest.It
+    ifNotCiWin: jest.It
     ifDevOrWinCi: jest.It
     ifWinCi: jest.It
     ifDevOrLinuxCi: jest.It

diff --git a/yarn.lock b/yarn.lock
@@ -22,27 +22,27 @@
     "7zip-bin-mac" "^1.0.1"
     "7zip-bin-win" "^2.0.2"
 
-"@develar/semantic-release@^6.3.24":
-  version "6.3.24"
-  resolved "https://registry.yarnpkg.com/@develar/semantic-release/-/semantic-release-6.3.24.tgz#79c7fdd4a2f5de879a8eb1cebde369fdb3a5784c"
+"@develar/semantic-release@^6.3.25":
+  version "6.3.25"
+  resolved "https://registry.yarnpkg.com/@develar/semantic-release/-/semantic-release-6.3.25.tgz#e53839080238152309065a83bf4cc84e2f060b20"
   dependencies:
     "@semantic-release/commit-analyzer" "^2.0.0"
     "@semantic-release/error" "^1.0.0"
     bluebird-lst-c "^1.0.5"
     conventional-changelog "^1.1.0"
     conventional-commits-parser "^1.3.0"
     debug "^2.3.3"
-    fs-extra-p "^3.0.2"
-    git-head "^1.15.0"
-    github "^6.1.0"
+    fs-extra-p "^3.0.3"
+    git-head "^1.17.0"
+    github "^7.0.1"
     hosted-git-info "^2.1.5"
     normalize-package-data "^2.3.5"
-    npm-registry-client "^7.4.1"
+    npm-registry-client "^7.4.5"
     require-relative "^0.8.7"
     run-auto "^2.0.0"
     run-series "^1.1.4"
     semver "^5.3.0"
-    through2 "^2.0.2"
+    through2 "^2.0.3"
 
 "@semantic-release/commit-analyzer@^2.0.0":
   version "2.0.0"
@@ -67,8 +67,8 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.5.28.tgz#efd7614f8eb1b924c41235ff653b7370da467fac"
 
 "@types/node@*":
-  version "6.0.51"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.51.tgz#84cbf25111516ec9304d0b61469dc0fa9d12ba32"
+  version "6.0.52"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.52.tgz#1ac3a99b42320f9e463482f25af4c2359473aaa6"
 
 "@types/source-map-support@^0.2.28":
   version "0.2.28"
@@ -161,9 +161,9 @@ archiver-utils@^1.3.0:
     normalize-path "^2.0.0"
     readable-stream "^2.0.0"
 
-archiver@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/archiver/-/archiver-1.2.0.tgz#fb5c6af5443b3fa6a426344753bad2a7b444aadd"
+archiver@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-1.3.0.tgz#4f2194d6d8f99df3f531e6881f14f15d55faaf22"
   dependencies:
     archiver-utils "^1.3.0"
     async "^2.0.0"
@@ -172,6 +172,7 @@ archiver@^1.2.0:
     lodash "^4.8.0"
     readable-stream "^2.0.0"
     tar-stream "^1.5.0"
+    walkdir "^0.0.11"
     zip-stream "^1.1.0"
 
 are-we-there-yet@~1.1.2:
@@ -1018,7 +1019,7 @@ dateformat@^1.0.11, dateformat@^1.0.12:
     get-stdin "^4.0.1"
     meow "^3.3.0"
 
-debug@2, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.2, debug@^2.3.3:
+debug@2, debug@2.3.3, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.2, debug@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
   dependencies:
@@ -1344,7 +1345,7 @@ from@~0:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.3.tgz#ef63ac2062ac32acf7862e0d40b44b896f22f3bc"
 
-fs-extra-p@^3.0.2, fs-extra-p@^3.0.3:
+fs-extra-p@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-3.0.3.tgz#2e48b1e6c196feb75ac6f0c6419760ce8b847f33"
   dependencies:
@@ -1411,7 +1412,7 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-head@^1.15.0:
+git-head@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/git-head/-/git-head-1.17.0.tgz#8714f83b8db7366b3f0f328aec5b5a4ec6ed71fb"
   dependencies:
@@ -1463,13 +1464,14 @@ github-url-from-username-repo@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz#7dd79330d2abe69c10c2cef79714c97215791dfa"
 
-github@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/github/-/github-6.1.0.tgz#664cbd232c59ce9d050749a188bd0f57ec8abcd8"
+github@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/github/-/github-7.0.1.tgz#7b0ae3de6bbe7211375717b683f56bc5f5e74dff"
   dependencies:
     follow-redirects "0.0.7"
     https-proxy-agent "^1.0.0"
     mime "^1.2.11"
+    netrc "^0.1.4"
 
 glob-base@^0.3.0:
   version "0.3.0"
@@ -2539,6 +2541,10 @@ natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
+netrc@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/netrc/-/netrc-0.1.4.tgz#6be94fcaca8d77ade0a9670dc460914c94472444"
+
 node-emoji@^1.4.1, node-emoji@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.4.3.tgz#5272f70b823c4df6d7c39f84fd8203f35b3e5d36"
@@ -2605,7 +2611,7 @@ normalize-path@^2.0.0, normalize-path@^2.0.1:
     hosted-git-info "^2.1.5"
     semver "^5.1.0"
 
-npm-registry-client@^7.4.1:
+npm-registry-client@^7.4.5:
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-7.4.5.tgz#1ef61851bb7231db53e397aaf76ddf1cb645c3df"
   dependencies:
@@ -2718,8 +2724,8 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
 osenv@^0.1.0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.3.tgz#83cf05c6d6458fc4d5ac6362ea325d92f2754217"
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -3094,10 +3100,14 @@ require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
 
-[email protected], [email protected], resolve@^1.1.6, resolve@^1.1.7:
+[email protected], [email protected]:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
+resolve@^1.1.6, resolve@^1.1.7:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
+
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -3391,7 +3401,7 @@ [email protected]:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"
 
-through2@^2.0.0, through2@^2.0.2, through2@~2.0.0:
+through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
@@ -3593,7 +3603,7 @@ walk@^2.3.9:
   dependencies:
     foreachasync "^3.0.0"
 
-[email protected]:
+[email protected], walkdir@^0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532"