Merge 403dd2c into 962cea5

webpack · May 24, 2018 · 75bf7bf · 75bf7bf
2 parents 962cea5 + 403dd2c
commit 75bf7bf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,6 +40,10 @@ matrix:
       node_js: "10"
       env: NO_WATCH_TESTS=1 JOB_PART=unit
       stage: advanced
+    - os: linux
+      node_js: "8"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration2
+      stage: advanced
     - os: osx
       node_js: "10"
       env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration1
@@ -49,15 +53,11 @@ matrix:
       env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration2
       stage: versions
     - os: linux
-      node_js: "8"
+      node_js: "6"
       env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration1
       stage: versions
     - os: linux
       node_js: "8"
-      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration2
-      stage: versions
-    - os: linux
-      node_js: "6"
       env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration1
       stage: versions
     - os: linux

diff --git a/appveyor.yml b/appveyor.yml
@@ -9,30 +9,29 @@ branches:
 init:
   - git config --global core.autocrlf input
 
+cache:
+  - ".yarn-cache"
+
 # what combinations to test
 environment:
   matrix:
-    - nodejs_version: 8
+    - nodejs_version: 10
       job_part: unit
-    - nodejs_version: 8
+    - nodejs_version: 10
       job_part: integration1
       jest: --maxWorkers=2
-    - nodejs_version: 8
+    - nodejs_version: 10
       job_part: integration2
       jest: --maxWorkers=2
     - nodejs_version: 6
       job_part: integration1
       jest: --maxWorkers=2
-    - nodejs_version: 6
-      job_part: integration2
-      jest: --maxWorkers=2
 
 install:
   - ps: Install-Product node $env:nodejs_version x64
-  - npm install yarn -g
-  - yarn install --frozen-lockfile
-  - yarn link --frozen-lockfile || yarn link --frozen-lockfile
-  - yarn link webpack --frozen-lockfile
+  - yarn --frozen-lockfile --preferred-cache-folder .yarn-cache
+  - yarn link --frozen-lockfile --preferred-cache-folder .yarn-cache || yarn link --frozen-lockfile --preferred-cache-folder .yarn-cache
+  - yarn link webpack --frozen-lockfile --preferred-cache-folder .yarn-cache
 
 build: off