Merge pull request #1093 from nos/develop

[RELEASE-3] 0.6.0
nos · Aug 13, 2019 · 1b84319 · 1b84319
2 parents dcf7642 + 3fedb3b
commit 1b84319
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,14 +12,14 @@ references:
 
   win_config: &win_config
     docker:
-      - image: electronuserland/builder:wine
+      - image: legiit/electron-builder-wine:node12
         environment:
           TARGET_ARCH: x64
     working_directory: *workspace
 
   mac_config: &mac_config
     macos:
-      xcode: '10.1.0'
+      xcode: '10.3.0'
     working_directory: *workspace
 
 jobs:
@@ -61,13 +61,6 @@ jobs:
     <<: *win_config
     steps:
       - checkout
-      - run: |
-          echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-          echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
-      - run: |
-          nvm install v10.13.0
-          nvm use v10.13.0
-          node -v
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "package.json" }}
@@ -101,13 +94,6 @@ jobs:
     <<: *mac_config
     steps:
       - checkout
-      - run: |
-          echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-          echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
-      - run: |
-          nvm install v10.13.0
-          nvm use v10.13.0
-          node -v
       - restore_cache:
           keys:
             - v3-dependencies-{{ checksum "package.json" }}

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
   "main": "dist/main/main.js",
   "license": "MIT",
   "engines": {
-    "node": "^10.13.0 || >=12.8.0"
+    "node": "^8.14.0 || ^10.12.0 || >=12.0.0"
   },
   "dependencies": {
     "@cityofzion/neon-js": "3.11.9",