diff --git a/.travis.yml b/.travis.yml index ba9c02c8d..d578fd8da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,17 @@ language: node_js node_js: -- '12' -dist: trusty -sudo: false +# Use 10.15.0 because xcode11 already has it installed, and xcode 11 is slow so +# we do what we can to make it faster. +- "10.15.0" +dist: bionic +osx_image: xcode11 matrix: include: - os: osx - os: linux -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-5 - - g++-5 cache: directories: - - node_modules + - "$HOME/.npm" - "$HOME/.cache/electron" - "$HOME/.cache/electron-builder" env: @@ -28,10 +23,7 @@ env: # encrypted GH_TOKEN: - secure: N551P94nYNIuv5IIcvgtee/jfd9ReGYRbq5hUvgG1pRbb+8wtNWT9JM6qIUflj0GoVCDeuz+urvqFwC4OET/NC6sGB9rtVoAVjf7vfKaoxPTN2wSMjT8GcVXvnG6S5hdPO6JlVrXZf2kDJr8p0vWKgRTgU7hSfEr8Nuxk938MC+qLUpuS6oAx0Vekkq/05OrZMIiheqHpSbXZido1SWBEy+XdL1MpNpKYSnp4gQXxtOQkF28vHQMKVDvPNoPm0RpuYmab6kJnGXDkWIsBtZlknw+Wf0oK9LJRuV8jFD4rkxRthuYDAXiep3dY8bkCZzo80Sy/KEB2oYKvMSBNDYlBoYeR3hsv5OB8ujhCDoXdBddjhIEe9vIFV93QWVzE+XCCfG1IczhTQ57Pk33eGfvRv/QnGnXKdSqS2+4roXOfohFh98oRzKGsFhjZ+22QQkyBHwcghw5xywPcr8ZF0ZC06pF7hvCFIlubDz9ZAaQo7vkpXbbft34ooxpGvSgQ5JOUXMu/zDy1E+szXwgcCn5trXhPEUhznCKiC2qrR4q1mVzyspXOHxz7hXkthWqUZEKFWrJw3/ttSZd1qQ7HFv2Re1eEIA/Q0HpCMe4Php5oqRDsxA7zUIHpw19aqtAhCR4WNg8yY7OmGXp3VeUQ3aiS/fFBbbsYRFj62Fv4Hr5BJY= before_install: -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CC="gcc-5"; export CXX="g++-5"; - export LINK="gcc-5"; export LINKXX="g++-5"; fi -- | - if [ "$TRAVIS_OS_NAME" = "osx" ]; then +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CSC_IDENTITY_AUTO_DISCOVERY=false; export CSC_LINK=certs/osx.p12; openssl aes-256-cbc -K $encrypted_7777a4e0a460_key -iv $encrypted_7777a4e0a460_iv -in certs/osx.p12.enc -out $CSC_LINK -d; @@ -43,9 +35,6 @@ before_install: security import $CSC_LINK -k $KEYCHAIN -P $CSC_KEY_PASSWORD -T /usr/bin/codesign; security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k mysecretpassword $KEYCHAIN; fi -- nvm --version -- node --version -- npm --version script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then npm run build-linux; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm run build-mac; fi diff --git a/README.md b/README.md index e6760798f..9823faade 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,7 @@ Please open issues and pull requests for new features, questions, and bug fixes. Requirements: -- `npm v6.9.0` -- `node v12.8.0` +- `node v10.15.0` To get started: diff --git a/appveyor.yml b/appveyor.yml index c06996418..36ba91eed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ environment: GH_TOKEN: secure: S+Bnfbb+uco7s2X3jqmfP3vwxLIIZTmNmT0f8y982PaiUQB1AW8YNN7Acpi0JQOi matrix: - - nodejs_version: 12 + - nodejs_version: 10.15.0 install: - ps: $env:package_version = (Get-Content -Raw -Path package.json | ConvertFrom-Json).version diff --git a/package.json b/package.json index 1ef1ddedf..981159ed2 100644 --- a/package.json +++ b/package.json @@ -255,7 +255,6 @@ "dmg-builder": "^5.3.0" }, "devEngines": { - "node": ">=12.8", - "npm": ">=6.9" + "node": "10.15.0" } }