fix: add mutex so tests can run in parallel

oclif · Feb 2, 2018 · b03b605 · b03b605
1 parent bf719e4
commit b03b605
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,8 +4,8 @@ jobs:
   lint: &lint
     docker:
       - image: node:latest
-    environment:
-      - TEST_SERIES: 1
+    # environment:
+    #   - TEST_SERIES: 1
     working_directory: ~/cli
     steps:
       - checkout

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   nodejs_version: "9"
-  TEST_SERIES: "1"
+  # TEST_SERIES: "1"
   matrix:
     - TEST_TYPE: base
     - TEST_TYPE: single

diff --git a/src/generators/app.ts b/src/generators/app.ts
@@ -392,9 +392,11 @@ class App extends Generator {
         'concurrently',
       )
     }
+    let yarnOpts = {} as any
+    if (process.env.YARN_MUTEX) yarnOpts.mutex = process.env.YARN_MUTEX
     Promise.all([
-      this.yarnInstall(devDependencies, {dev: true, ignoreScripts: true}),
-      this.yarnInstall(dependencies),
+      this.yarnInstall(devDependencies, {...yarnOpts, dev: true, ignoreScripts: true}),
+      this.yarnInstall(dependencies, yarnOpts),
     ]).then(() => {
       console.log(`\nCreated ${this.pjson.name} in ${this.destinationRoot()}`)
     })

diff --git a/test/run.js b/test/run.js
@@ -11,6 +11,8 @@ const {CI} = process.env
 delete process.env.CI
 process.env.ANYCLI_DEBUG = '1'
 
+process.env.YARN_MUTEX = `file:${tmp.tmpNameSync()}`
+
 function generate(args) {
   const run = path.join(__dirname, '../bin/run')
   sh.exec(`node ${run} ${args}`)