From 2930e90843b258e44a08225ec516f822e891bfbb Mon Sep 17 00:00:00 2001
From: Maurice Dalderup <Maurice_Dalderup@hotmail.com>
Date: Tue, 13 Aug 2019 19:40:54 +0200
Subject: [PATCH 1/4] chore(circleci): update config

---
 .circleci/config.yml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 86b17fe7e..7ca0fc4a3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,14 +12,14 @@ references:
 
   win_config: &win_config
     docker:
-      - image: electronuserland/builder:wine
+      - image: legiit/builder-wine-node10:latest
         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" }}

From c88991f1a7c8266a8ef3e27a39d6a22162b57d86 Mon Sep 17 00:00:00 2001
From: Maurice Dalderup <Maurice_Dalderup@hotmail.com>
Date: Tue, 13 Aug 2019 19:47:46 +0200
Subject: [PATCH 2/4] chore(package.json): adjust engines (#1094)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a8a603d18..e66ff313f 100644
--- 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": "^10.13.0 || >=12.0.0"
   },
   "dependencies": {
     "@cityofzion/neon-js": "3.11.9",

From b7a3a2bf76cb264b17c919f4f3123674f4fde9d3 Mon Sep 17 00:00:00 2001
From: Maurice Dalderup <Maurice_Dalderup@hotmail.com>
Date: Tue, 13 Aug 2019 20:13:53 +0200
Subject: [PATCH 3/4] chore(package.json): adjust node engines (#1095)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 3fedb3b566d623c677edbddda4ffb5053fa96d0f Mon Sep 17 00:00:00 2001
From: Maurice Dalderup <Maurice_Dalderup@hotmail.com>
Date: Tue, 13 Aug 2019 20:22:27 +0200
Subject: [PATCH 4/4] chore(circleci): replace container image with custom
 image (#1096)

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ca0fc4a3..0d5b7e9f1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,7 +12,7 @@ references:
 
   win_config: &win_config
     docker:
-      - image: legiit/builder-wine-node10:latest
+      - image: legiit/electron-builder-wine:node12
         environment:
           TARGET_ARCH: x64
     working_directory: *workspace