travis: ignore failed brew upgrade npm, update xcode

PR-URL: #1932 Reviewed-By: Rod Vagg <rod@vagg.org>
nodejs · Nov 18, 2019 · 0705cae · 0705cae
1 parent 7bfdb6f
commit 0705cae
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ matrix:
       python: 2.7
     - name: "Python 2.7 on macOS"
       os: osx
-      osx_image: xcode11
+      osx_image: xcode11.2
       language: shell  # 'language: python' is not yet supported on macOS
       env: NODE_GYP_FORCE_PYTHON=python2
       before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
@@ -55,10 +55,10 @@ matrix:
       before_install: nvm install 12
     - name: "Python 3.7 on macOS"
       os: osx
-      #osx_image: xcode11
+      osx_image: xcode11.2
       language: shell  # 'language: python' is not yet supported on macOS
       env: NODE_GYP_FORCE_PYTHON=python3
-      before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
+      before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade npm || true
     - name: "Node.js 12 & Python 3.7 on Windows"
       os: windows
       language: node_js