mirror of
https://github.com/atom/atom.git
synced 2026-01-15 01:48:15 -05:00
Go back to using a concurrency of 2
This commit is contained in:
@@ -4,11 +4,7 @@ path = require 'path'
|
||||
_ = require 'underscore-plus'
|
||||
async = require 'async'
|
||||
|
||||
if process.env.JANKY_SHA1
|
||||
# Use all the cores on CI
|
||||
concurrency = require('os').cpus().length
|
||||
else
|
||||
concurrency = 2
|
||||
concurrency = 2
|
||||
|
||||
module.exports = (grunt) ->
|
||||
{isAtomPackage, spawn} = require('./task-helpers')(grunt)
|
||||
|
||||
@@ -45,7 +45,7 @@ Object.defineProperty document, 'title',
|
||||
|
||||
jasmine.getEnv().addEqualityTester(_.isEqual) # Use underscore's definition of equality for toEqual assertions
|
||||
|
||||
if process.env.JANKY_SHA1
|
||||
if process.env.JANKY_SHA1 and process.platform is 'win32'
|
||||
jasmine.getEnv().defaultTimeoutInterval = 60000
|
||||
else
|
||||
jasmine.getEnv().defaultTimeoutInterval = 5000
|
||||
|
||||
Reference in New Issue
Block a user