From a1e0a29fae0fe7c25982556d0678bcdcb3be61d7 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Tue, 20 Mar 2018 11:05:36 +0100
Subject: move windows arch config to electron-builder.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'appveyor.yml')

diff --git a/appveyor.yml b/appveyor.yml
index d9296b1f6..8c83a5644 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,7 @@ before_build:
   - yarn lint
 
 build_script:
-  - yarn build --x64 --ia32
+  - yarn build
 
 notifications:
   - provider: Slack
-- 
cgit v1.2.3-70-g09d2


From b6bb740aaf9f84144d91ec6d218ef5e40ae0c347 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Thu, 15 Nov 2018 21:43:54 +0100
Subject: Switch to npm

---
 .travis.yml  | 10 +++++-----
 appveyor.yml | 11 +++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'appveyor.yml')

diff --git a/.travis.yml b/.travis.yml
index 78c1e3693..28f61ac0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,12 @@ matrix:
 language: node_js
 
 before_script:
-- yarn add global node-sass
-- yarn install
+- npm install node-sass -g
+- npm ci
 
 script:
-- yarn lint
-- travis_wait yarn build
+- npm run lint
+- travis_wait npm run build
 
 node_js:
 - '8'
@@ -22,7 +22,7 @@ node_js:
 before_install:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi
 
-cache: yarn
+cache: npm
 
 notifications:
   email: false
diff --git a/appveyor.yml b/appveyor.yml
index 8c83a5644..351607edc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,17 +10,16 @@ version: 5.0.0.{build}
 
 install:
   - ps: Install-Product node 8
-  - yarn cache clean
-  - yarn install
+  - npm ci
 
-# cache:
-#  - "%LOCALAPPDATA%\\Yarn"
+cache:
+ - '%APPDATA%\npm-cache'
 
 before_build:
-  - yarn lint
+  - npm run lint
 
 build_script:
-  - yarn build
+  - npm run build
 
 notifications:
   - provider: Slack
-- 
cgit v1.2.3-70-g09d2


From 8c39328de1c6b5122a40430b8d85d6294dfea909 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 19 Nov 2018 12:11:48 +0100
Subject: Update CI to use nvmrc

---
 .travis.yml  | 3 ---
 appveyor.yml | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'appveyor.yml')

diff --git a/.travis.yml b/.travis.yml
index 7fca11401..dfea3a41e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,6 @@ script:
 - npm run lint
 - travis_wait npm run build
 
-node_js:
-- '8'
-
 cache: npm
 
 notifications:
diff --git a/appveyor.yml b/appveyor.yml
index 351607edc..1a11a1e1d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,9 @@ environment:
 version: 5.0.0.{build}
 
 install:
-  - ps: Install-Product node 8
-  - npm ci
+  - ps: Install-Module nvm
+  - ps: Install-NodeVersion
+  - ps: npm ci
 
 cache:
  - '%APPDATA%\npm-cache'
-- 
cgit v1.2.3-70-g09d2


From c4448a2cf6a5f71d5541c7c29807de3a8181a021 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 19 Nov 2018 12:32:47 +0100
Subject: Test loading from nvmrc on win

---
 appveyor.yml | 8 +++++---
 package.json | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'appveyor.yml')

diff --git a/appveyor.yml b/appveyor.yml
index 1a11a1e1d..1d614b4c7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,9 +9,11 @@ environment:
 version: 5.0.0.{build}
 
 install:
-  - ps: Install-Module nvm
-  - ps: Install-NodeVersion
-  - ps: npm ci
+  - ps: $version = Get-Content .\.nvmrc -Raw 
+  - ps: Install-Product node $version
+  - npm ci
+  - node --version
+  - npm --version
 
 cache:
  - '%APPDATA%\npm-cache'
diff --git a/package.json b/package.json
index d096a3d97..3984bdc3c 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
   ],
   "husky": {
     "hooks": {
-      "pre-commit": "npm run lint && npm run reformat-files"
+      "pre-push": "npm run lint && npm run reformat-files"
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2