From 6c4eb7439a76c4f422bb3e61f9829f5405f0863b Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 12:11:27 -0800 Subject: [PATCH 01/28] Turn up debugging for atom-shell downloads --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index f79fe7f40..627e5967a 100755 --- a/script/cibuild +++ b/script/cibuild @@ -33,7 +33,7 @@ cp.safeExec.bind(global, 'node script/bootstrap', function(error) { var tasks = [ require('rimraf').bind(global, path.join(homeDir, '.atom')), cp.safeExec.bind(global, 'git clean -dff'), - cp.safeExec.bind(global, gruntPath + ' ci --stack --no-color'), + cp.safeExec.bind(global, gruntPath + ' ci --stack --no-color --verbose'), ] if (process.platform === 'darwin') { tasks.push(cp.safeExec.bind(global, 'node_modules/.bin/coffee script/upload-release')) From c9aa082e63a1854008c77e6bbad97d65d8a0c7df Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 14:22:17 -0800 Subject: [PATCH 02/28] Revert "Turn up debugging for atom-shell downloads" This reverts commit 6c4eb7439a76c4f422bb3e61f9829f5405f0863b. --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index 627e5967a..f79fe7f40 100755 --- a/script/cibuild +++ b/script/cibuild @@ -33,7 +33,7 @@ cp.safeExec.bind(global, 'node script/bootstrap', function(error) { var tasks = [ require('rimraf').bind(global, path.join(homeDir, '.atom')), cp.safeExec.bind(global, 'git clean -dff'), - cp.safeExec.bind(global, gruntPath + ' ci --stack --no-color --verbose'), + cp.safeExec.bind(global, gruntPath + ' ci --stack --no-color'), ] if (process.platform === 'darwin') { tasks.push(cp.safeExec.bind(global, 'node_modules/.bin/coffee script/upload-release')) From bda8397d3d6ac226697bdcb90369bacb0291270e Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 14:23:28 -0800 Subject: [PATCH 03/28] Revert "Switch to git for cloning apm" This reverts commit fd929364d1401c68b069c57179cc7c3702e264e5. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 363ee63b2..e4335ef79 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "vendor/apm"] path = vendor/apm - url = git@github.com:atom/apm.git + url = https://github.com/atom/apm.git From 171c3e018b590ca65dae275210f4c526e1eee962 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 14:57:13 -0800 Subject: [PATCH 04/28] Attempt to fix truncated log messages --- spec/jasmine-helper.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/jasmine-helper.coffee b/spec/jasmine-helper.coffee index 88249e867..613e07604 100644 --- a/spec/jasmine-helper.coffee +++ b/spec/jasmine-helper.coffee @@ -25,6 +25,7 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) -> timeReporter.logLongestSuites 10, (line) -> process.stdout.write("#{line}\n") process.stdout.write('\n') timeReporter.logLongestSpecs 10, (line) -> process.stdout.write("#{line}\n") + fs.closeSync(logStream) atom.exit(runner.results().failedCount > 0 ? 1 : 0) else AtomReporter = require './atom-reporter' From 91d1c2914ee1fca6e14d202318ef29cde85166af Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 15:12:30 -0800 Subject: [PATCH 05/28] Write to stderr instead, for quicker flushing --- tasks/spec-task.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 8123dad3d..13ef31852 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -39,7 +39,7 @@ module.exports = (grunt) -> grunt.verbose.writeln "Launching #{path.basename(packagePath)} specs." spawn options, (error, results, code) -> if process.platform is 'win32' - process.stdout.write(fs.readFileSync(path.join(packagePath, 'ci.log'))) + process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log'))) fs.unlinkSync(path.join(packagePath, 'ci.log')) failedPackages.push path.basename(packagePath) if error @@ -77,7 +77,7 @@ module.exports = (grunt) -> spawn options, (error, results, code) -> if process.platform is 'win32' - process.stdout.write(fs.readFileSync('ci.log')) + process.stderr.write(fs.readFileSync('ci.log')) fs.unlinkSync('ci.log') else # TODO: Restore concurrency on Windows From 8597951f0c1148a8fdc045b8b27f8d362283102f Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 15:24:18 -0800 Subject: [PATCH 06/28] Make sure logStream exists --- spec/jasmine-helper.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/jasmine-helper.coffee b/spec/jasmine-helper.coffee index 613e07604..2e9cfae50 100644 --- a/spec/jasmine-helper.coffee +++ b/spec/jasmine-helper.coffee @@ -25,7 +25,7 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) -> timeReporter.logLongestSuites 10, (line) -> process.stdout.write("#{line}\n") process.stdout.write('\n') timeReporter.logLongestSpecs 10, (line) -> process.stdout.write("#{line}\n") - fs.closeSync(logStream) + fs.closeSync(logStream) if logStream? atom.exit(runner.results().failedCount > 0 ? 1 : 0) else AtomReporter = require './atom-reporter' From 9c7747efbfe63de6807703eba443711174b1263d Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 16:38:03 -0800 Subject: [PATCH 07/28] Don't close ci output, as it's hanging --- tasks/spec-task.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 13ef31852..522c65b59 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -40,7 +40,7 @@ module.exports = (grunt) -> spawn options, (error, results, code) -> if process.platform is 'win32' process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log'))) - fs.unlinkSync(path.join(packagePath, 'ci.log')) + #fs.unlinkSync(path.join(packagePath, 'ci.log')) failedPackages.push path.basename(packagePath) if error callback() @@ -78,7 +78,7 @@ module.exports = (grunt) -> spawn options, (error, results, code) -> if process.platform is 'win32' process.stderr.write(fs.readFileSync('ci.log')) - fs.unlinkSync('ci.log') + #fs.unlinkSync('ci.log') else # TODO: Restore concurrency on Windows packageSpecQueue.concurrency = 2 From 6736b6af3e0d70f43ec7ca9a7031f8726e2b23e4 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 16:38:14 -0800 Subject: [PATCH 08/28] Don't remove ci.log files for debugging --- spec/jasmine-helper.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/jasmine-helper.coffee b/spec/jasmine-helper.coffee index 2e9cfae50..88249e867 100644 --- a/spec/jasmine-helper.coffee +++ b/spec/jasmine-helper.coffee @@ -25,7 +25,6 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) -> timeReporter.logLongestSuites 10, (line) -> process.stdout.write("#{line}\n") process.stdout.write('\n') timeReporter.logLongestSpecs 10, (line) -> process.stdout.write("#{line}\n") - fs.closeSync(logStream) if logStream? atom.exit(runner.results().failedCount > 0 ? 1 : 0) else AtomReporter = require './atom-reporter' From 40630114e773bc9de9f2ba281550d4ccac0f46bb Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 17:12:12 -0800 Subject: [PATCH 09/28] Another attempt at preventing clipping --- spec/jasmine-helper.coffee | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/spec/jasmine-helper.coffee b/spec/jasmine-helper.coffee index 88249e867..0abc17244 100644 --- a/spec/jasmine-helper.coffee +++ b/spec/jasmine-helper.coffee @@ -10,21 +10,23 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) -> TimeReporter = require './time-reporter' timeReporter = new TimeReporter() - if logFile? - logStream = fs.createWriteStream(logFile, flags: 'w') - process.__defineGetter__ 'stdout', -> logStream - process.__defineGetter__ 'stderr', -> logStream + logStream = fs.openSync(logFile, 'w') if logFile? + log = (args...) -> + if logStream? + fs.writeSync(args...) + else + process.stderr.write(args...) if atom.getLoadSettings().exitWhenDone {jasmineNode} = require 'jasmine-node/lib/jasmine-node/reporter' reporter = new jasmineNode.TerminalReporter print: (args...) -> - process.stderr.write(args...) + log(args...) onComplete: (runner) -> - process.stdout.write('\n') - timeReporter.logLongestSuites 10, (line) -> process.stdout.write("#{line}\n") - process.stdout.write('\n') - timeReporter.logLongestSpecs 10, (line) -> process.stdout.write("#{line}\n") + log('\n') + timeReporter.logLongestSuites 10, (line) -> log("#{line}\n") + log('\n') + timeReporter.logLongestSpecs 10, (line) -> log("#{line}\n") atom.exit(runner.results().failedCount > 0 ? 1 : 0) else AtomReporter = require './atom-reporter' From 1da6bca2ae47c1b5020bd7fe3bd00911fed8e736 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 18:35:20 -0800 Subject: [PATCH 10/28] Properly use writeSync --- spec/jasmine-helper.coffee | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spec/jasmine-helper.coffee b/spec/jasmine-helper.coffee index 0abc17244..c57a5dc37 100644 --- a/spec/jasmine-helper.coffee +++ b/spec/jasmine-helper.coffee @@ -11,22 +11,23 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) -> timeReporter = new TimeReporter() logStream = fs.openSync(logFile, 'w') if logFile? - log = (args...) -> + log = (str) -> if logStream? - fs.writeSync(args...) + fs.writeSync(logStream, str) else - process.stderr.write(args...) + process.stderr.write(str) if atom.getLoadSettings().exitWhenDone {jasmineNode} = require 'jasmine-node/lib/jasmine-node/reporter' reporter = new jasmineNode.TerminalReporter - print: (args...) -> - log(args...) + print: (str) -> + log(str) onComplete: (runner) -> log('\n') timeReporter.logLongestSuites 10, (line) -> log("#{line}\n") log('\n') timeReporter.logLongestSpecs 10, (line) -> log("#{line}\n") + fs.closeSync(logStream) if logStream? atom.exit(runner.results().failedCount > 0 ? 1 : 0) else AtomReporter = require './atom-reporter' From fd6e5e7a13153e0b3e069fef828d7853888ec587 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 18:36:40 -0800 Subject: [PATCH 11/28] Don't run package specs --- tasks/spec-task.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 522c65b59..dd9a524a2 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -47,6 +47,7 @@ module.exports = (grunt) -> modulesDirectory = path.resolve('node_modules') for packageDirectory in fs.readdirSync(modulesDirectory) + return callback(null, []) packagePath = path.join(modulesDirectory, packageDirectory) continue unless grunt.file.isDir(path.join(packagePath, 'spec')) continue unless isAtomPackage(packagePath) From d8374eb2518b87b18b0bf9b64dd43f289fcee9e4 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 18:45:17 -0800 Subject: [PATCH 12/28] Revert "Don't run package specs" This reverts commit fd6e5e7a13153e0b3e069fef828d7853888ec587. --- tasks/spec-task.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index dd9a524a2..522c65b59 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -47,7 +47,6 @@ module.exports = (grunt) -> modulesDirectory = path.resolve('node_modules') for packageDirectory in fs.readdirSync(modulesDirectory) - return callback(null, []) packagePath = path.join(modulesDirectory, packageDirectory) continue unless grunt.file.isDir(path.join(packagePath, 'spec')) continue unless isAtomPackage(packagePath) From 9e3648c22f138c36086733203c6aa2d0f40631d9 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Wed, 18 Dec 2013 18:45:41 -0800 Subject: [PATCH 13/28] Remove ci.log files --- tasks/spec-task.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 522c65b59..13ef31852 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -40,7 +40,7 @@ module.exports = (grunt) -> spawn options, (error, results, code) -> if process.platform is 'win32' process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log'))) - #fs.unlinkSync(path.join(packagePath, 'ci.log')) + fs.unlinkSync(path.join(packagePath, 'ci.log')) failedPackages.push path.basename(packagePath) if error callback() @@ -78,7 +78,7 @@ module.exports = (grunt) -> spawn options, (error, results, code) -> if process.platform is 'win32' process.stderr.write(fs.readFileSync('ci.log')) - #fs.unlinkSync('ci.log') + fs.unlinkSync('ci.log') else # TODO: Restore concurrency on Windows packageSpecQueue.concurrency = 2 From fa18a5cb33f9a27a13f7b42e29b89a0201f4d3ee Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 19 Dec 2013 10:36:19 -0800 Subject: [PATCH 14/28] Parallelize package specs --- tasks/spec-task.coffee | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 13ef31852..89fcd7089 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -52,9 +52,7 @@ module.exports = (grunt) -> continue unless isAtomPackage(packagePath) packageSpecQueue.push(packagePath) - # TODO: Restore concurrency on Windows - packageSpecQueue.concurrency = 1 unless process.platform is 'win32' - + packageSpecQueue.concurrency = 1 packageSpecQueue.drain = -> callback(null, failedPackages) runCoreSpecs = (callback) -> @@ -79,10 +77,8 @@ module.exports = (grunt) -> if process.platform is 'win32' process.stderr.write(fs.readFileSync('ci.log')) fs.unlinkSync('ci.log') - else - # TODO: Restore concurrency on Windows - packageSpecQueue.concurrency = 2 + packageSpecQueue.concurrency = 2 callback(null, error) grunt.registerTask 'run-specs', 'Run the specs', -> From 7cb1ea038ce6192890757a65921d0fe281370fec Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 19 Dec 2013 10:56:18 -0800 Subject: [PATCH 15/28] Parallelize core specs as well --- tasks/spec-task.coffee | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 89fcd7089..7750d08c4 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -85,14 +85,7 @@ module.exports = (grunt) -> done = @async() startTime = Date.now() - # TODO: This should really be parallel on both platforms, however our - # fixtures step on each others toes currently. - if process.platform is 'darwin' - method = async.parallel - else if process.platform is 'win32' - method = async.series - - method [runCoreSpecs, runPackageSpecs], (error, results) -> + async.parallel [runCoreSpecs, runPackageSpecs], (error, results) -> [coreSpecFailed, failedPackages] = results elapsedTime = Math.round((Date.now() - startTime) / 100) / 10 grunt.verbose.writeln("Total spec time: #{elapsedTime}s") From a76cda45640f07251714e308688ebddd6e834f20 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 19 Dec 2013 11:28:42 -0800 Subject: [PATCH 16/28] Revert "Parallelize core specs as well" This reverts commit 7cb1ea038ce6192890757a65921d0fe281370fec. --- tasks/spec-task.coffee | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 7750d08c4..89fcd7089 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -85,7 +85,14 @@ module.exports = (grunt) -> done = @async() startTime = Date.now() - async.parallel [runCoreSpecs, runPackageSpecs], (error, results) -> + # TODO: This should really be parallel on both platforms, however our + # fixtures step on each others toes currently. + if process.platform is 'darwin' + method = async.parallel + else if process.platform is 'win32' + method = async.series + + method [runCoreSpecs, runPackageSpecs], (error, results) -> [coreSpecFailed, failedPackages] = results elapsedTime = Math.round((Date.now() - startTime) / 100) / 10 grunt.verbose.writeln("Total spec time: #{elapsedTime}s") From 91778cb566550031dcf34ee4ab3133c6387b4e7d Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 19 Dec 2013 11:29:32 -0800 Subject: [PATCH 17/28] Revert "Parallelize package specs" This reverts commit fa18a5cb33f9a27a13f7b42e29b89a0201f4d3ee. --- tasks/spec-task.coffee | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 89fcd7089..13ef31852 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -52,7 +52,9 @@ module.exports = (grunt) -> continue unless isAtomPackage(packagePath) packageSpecQueue.push(packagePath) - packageSpecQueue.concurrency = 1 + # TODO: Restore concurrency on Windows + packageSpecQueue.concurrency = 1 unless process.platform is 'win32' + packageSpecQueue.drain = -> callback(null, failedPackages) runCoreSpecs = (callback) -> @@ -77,8 +79,10 @@ module.exports = (grunt) -> if process.platform is 'win32' process.stderr.write(fs.readFileSync('ci.log')) fs.unlinkSync('ci.log') + else + # TODO: Restore concurrency on Windows + packageSpecQueue.concurrency = 2 - packageSpecQueue.concurrency = 2 callback(null, error) grunt.registerTask 'run-specs', 'Run the specs', -> From 2ad9fb52aeacb5a8e974777d8c357bb1f630b9f2 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 19 Dec 2013 11:33:42 -0800 Subject: [PATCH 18/28] Restore package concurrency --- tasks/spec-task.coffee | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 13ef31852..4237bfd06 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -52,9 +52,7 @@ module.exports = (grunt) -> continue unless isAtomPackage(packagePath) packageSpecQueue.push(packagePath) - # TODO: Restore concurrency on Windows - packageSpecQueue.concurrency = 1 unless process.platform is 'win32' - + packageSpecQueue.concurrency = if process.platform is 'win32' then 2 else 1 packageSpecQueue.drain = -> callback(null, failedPackages) runCoreSpecs = (callback) -> @@ -79,10 +77,8 @@ module.exports = (grunt) -> if process.platform is 'win32' process.stderr.write(fs.readFileSync('ci.log')) fs.unlinkSync('ci.log') - else - # TODO: Restore concurrency on Windows - packageSpecQueue.concurrency = 2 + packageSpecQueue.concurrency = 2 callback(null, error) grunt.registerTask 'run-specs', 'Run the specs', -> From 8fb729d0003a3f8a702670fed1a9e9f49c4aab83 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 19 Dec 2013 11:43:28 -0800 Subject: [PATCH 19/28] Check for existence --- tasks/spec-task.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 4237bfd06..5b48d37ad 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -78,7 +78,7 @@ module.exports = (grunt) -> process.stderr.write(fs.readFileSync('ci.log')) fs.unlinkSync('ci.log') - packageSpecQueue.concurrency = 2 + packageSpecQueue.concurrency = 2 if packageSpecQueue? callback(null, error) grunt.registerTask 'run-specs', 'Run the specs', -> From 1d70e12594e25f4ba8ae85cc39d4b3fb9be3b11f Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 19 Dec 2013 12:02:12 -0800 Subject: [PATCH 20/28] Revert "Check for existence" This reverts commit 8fb729d0003a3f8a702670fed1a9e9f49c4aab83. --- tasks/spec-task.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 5b48d37ad..4237bfd06 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -78,7 +78,7 @@ module.exports = (grunt) -> process.stderr.write(fs.readFileSync('ci.log')) fs.unlinkSync('ci.log') - packageSpecQueue.concurrency = 2 if packageSpecQueue? + packageSpecQueue.concurrency = 2 callback(null, error) grunt.registerTask 'run-specs', 'Run the specs', -> From 2d17ffc792edc383e39a8d673109cdc629100b7e Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 19 Dec 2013 12:02:18 -0800 Subject: [PATCH 21/28] Revert "Restore package concurrency" This reverts commit 2ad9fb52aeacb5a8e974777d8c357bb1f630b9f2. --- tasks/spec-task.coffee | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index 4237bfd06..13ef31852 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -52,7 +52,9 @@ module.exports = (grunt) -> continue unless isAtomPackage(packagePath) packageSpecQueue.push(packagePath) - packageSpecQueue.concurrency = if process.platform is 'win32' then 2 else 1 + # TODO: Restore concurrency on Windows + packageSpecQueue.concurrency = 1 unless process.platform is 'win32' + packageSpecQueue.drain = -> callback(null, failedPackages) runCoreSpecs = (callback) -> @@ -77,8 +79,10 @@ module.exports = (grunt) -> if process.platform is 'win32' process.stderr.write(fs.readFileSync('ci.log')) fs.unlinkSync('ci.log') + else + # TODO: Restore concurrency on Windows + packageSpecQueue.concurrency = 2 - packageSpecQueue.concurrency = 2 callback(null, error) grunt.registerTask 'run-specs', 'Run the specs', -> From aba1900d13328f3cf8ec068be42a08e0defa3c2a Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Fri, 20 Dec 2013 11:58:38 -0600 Subject: [PATCH 22/28] Upgrade link@0.12.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 926102c09..18fcdf8e3 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "grammar-selector": "0.13.0", "image-view": "0.11.0", "keybinding-resolver": "0.6.0", - "link": "0.11.0", + "link": "0.12.0", "markdown-preview": "0.22.0", "metrics": "0.20.0", "package-generator": "0.23.0", From e14019e2dde7a054211530464efa5af3847a2e2d Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Fri, 20 Dec 2013 12:25:40 -0600 Subject: [PATCH 23/28] Upgrade settings-view@0.53.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dcf68926a..609ac3313 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "metrics": "0.20.0", "package-generator": "0.23.0", "release-notes": "0.15.0", - "settings-view": "0.52.0", + "settings-view": "0.53.0", "snippets": "0.17.0", "spell-check": "0.17.0", "status-bar": "0.27.0", From e8f4da54a60bb47cd04251955576bc6c6e028e2f Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 2 Jan 2014 11:33:20 -0800 Subject: [PATCH 24/28] Upgrade find-and-replace@0.64.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d3d5fe4c..f3f83bb2f 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "editor-stats": "0.9.0", "exception-reporting": "0.9.0", "feedback": "0.21.0", - "find-and-replace": "0.63.0", + "find-and-replace": "0.64.0", "fuzzy-finder": "0.28.0", "gists": "0.13.0", "git-diff": "0.21.0", From 92ef8f22e4bf9a540319784f4f550672bc983026 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Thu, 2 Jan 2014 15:34:36 -0800 Subject: [PATCH 25/28] Upgrade scandal@0.10.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f3f83bb2f..34352447a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "pathwatcher": "0.11.0", "pegjs": "0.7.0", "q": "0.9.7", - "scandal": "0.9.0", + "scandal": "0.10.1", "season": "0.14.0", "semver": "1.1.4", "space-pen": "2.0.2", From 2c58d1a2b71c7d7d080c5f6ec826c270d8f1bd81 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Fri, 3 Jan 2014 09:31:44 -0800 Subject: [PATCH 26/28] Upgrade scandal@0.11.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34352447a..47403a99e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "pathwatcher": "0.11.0", "pegjs": "0.7.0", "q": "0.9.7", - "scandal": "0.10.1", + "scandal": "0.11.0", "season": "0.14.0", "semver": "1.1.4", "space-pen": "2.0.2", From cec731b697fb5ef3062140e226591e736a350e69 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Mon, 6 Jan 2014 11:17:34 -0800 Subject: [PATCH 27/28] Windows build status reflects package status now --- build/tasks/spec-task.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tasks/spec-task.coffee b/build/tasks/spec-task.coffee index 13ef31852..c2f4d6826 100644 --- a/build/tasks/spec-task.coffee +++ b/build/tasks/spec-task.coffee @@ -109,4 +109,4 @@ module.exports = (grunt) -> if process.platform is 'darwin' done(!coreSpecFailed and failedPackages.length == 0) else if process.platform is 'win32' - done(true) + done(failedPackages.length == 0) From 9add438ea4fc9967908d7565627e817044c39183 Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Mon, 6 Jan 2014 15:55:21 -0800 Subject: [PATCH 28/28] Revert "Windows build status reflects package status now" This reverts commit cec731b697fb5ef3062140e226591e736a350e69. --- build/tasks/spec-task.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tasks/spec-task.coffee b/build/tasks/spec-task.coffee index c2f4d6826..13ef31852 100644 --- a/build/tasks/spec-task.coffee +++ b/build/tasks/spec-task.coffee @@ -109,4 +109,4 @@ module.exports = (grunt) -> if process.platform is 'darwin' done(!coreSpecFailed and failedPackages.length == 0) else if process.platform is 'win32' - done(failedPackages.length == 0) + done(true)