Merge pull request #664 from electron-userland/disable-node-8-osx

Travis: Re-enable Node 5/OSX, Downgrade to npm@4 for Node 8/OSX
electron · Jun 5, 2017 · 2e48d1d · 2e48d1d
2 parents 1b14e0b + 4c9ec7f
commit 2e48d1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,10 +22,6 @@ branches:
   only:
   - master
   - /^v\d+\.\d+\.\d+/
-matrix:
-  allow_failures:
-  - node_js: '5'
-    os: osx
 env:
   global:
     # coveralls token

diff --git a/test/ci/before_install.sh b/test/ci/before_install.sh
@@ -13,6 +13,10 @@ case "$TRAVIS_OS_NAME" in
     sudo apt-get install -y wine1.6 yarn
     ;;
   "osx")
+    # Force NPM 4.x if Node 8
+    if test "$TRAVIS_NODE_VERSION" = "8"; then
+      npm install -g npm@4
+    fi
     # Create CA
     openssl req -newkey rsa:4096 -days 1 -x509 -nodes -subj \
       "/C=CI/ST=Travis/L=Developer/O=Developer/CN=Developer CA" \