From 691b1255d8e7b790fc4c422839a93ac032821790 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 1 Apr 2015 10:26:08 +0800 Subject: [PATCH 01/10] :arrow_up: atom-shell@0.22.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f55fcece..374f70956 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "url": "http://github.com/atom/atom/raw/master/LICENSE.md" } ], - "atomShellVersion": "0.22.2", + "atomShellVersion": "0.22.3", "dependencies": { "async": "0.2.6", "atom-keymap": "^5", From cfca178eef0c08a8bd36618787b96dedcfcaf0e0 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 1 Apr 2015 16:45:14 +0800 Subject: [PATCH 02/10] :arrow_up: grunt-atom-shell-installer@0.28 --- build/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.json b/build/package.json index aa3742e40..297ddadfd 100644 --- a/build/package.json +++ b/build/package.json @@ -12,7 +12,7 @@ "fs-plus": "2.x", "github-releases": "~0.2.0", "grunt": "~0.4.1", - "grunt-atom-shell-installer": "^0.25.0", + "grunt-atom-shell-installer": "^0.28.0", "grunt-cli": "~0.1.9", "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe", "grunt-contrib-coffee": "~0.12.0", From bec4b34385d0ed44214bffd5e236202fc120e702 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 1 Apr 2015 10:35:19 -0700 Subject: [PATCH 03/10] Log squirrel log on failures --- script/cibuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/script/cibuild b/script/cibuild index 08ff65c6e..4f2612ed8 100755 --- a/script/cibuild +++ b/script/cibuild @@ -90,6 +90,12 @@ cp.safeExec.bind(global, 'npm install npm --loglevel error', {cwd: path.resolve( cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'), ] async.series(tasks, function(error) { + if (error && process.platform === 'win32') { + var fs = require('fs'); + var squirrelLog = path.resolve(__dirname, 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); + if (fs.existsSync(squirrelLog)) + console.log(fs.readFileSync(squirrelLog)); + } process.exit(error ? 1 : 0); }); })(); From 3d8c19fc79c7e1091db348dba90c4cf4aeea47b5 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 1 Apr 2015 10:35:52 -0700 Subject: [PATCH 04/10] Add missing .. --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index 4f2612ed8..41c90f7b3 100755 --- a/script/cibuild +++ b/script/cibuild @@ -92,7 +92,7 @@ cp.safeExec.bind(global, 'npm install npm --loglevel error', {cwd: path.resolve( async.series(tasks, function(error) { if (error && process.platform === 'win32') { var fs = require('fs'); - var squirrelLog = path.resolve(__dirname, 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); + var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); if (fs.existsSync(squirrelLog)) console.log(fs.readFileSync(squirrelLog)); } From d384e0492d89b1d8fedeb633d7c51eed82218573 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 1 Apr 2015 10:40:59 -0700 Subject: [PATCH 05/10] Add charset to read call --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index 41c90f7b3..e418d1a15 100755 --- a/script/cibuild +++ b/script/cibuild @@ -94,7 +94,7 @@ cp.safeExec.bind(global, 'npm install npm --loglevel error', {cwd: path.resolve( var fs = require('fs'); var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); if (fs.existsSync(squirrelLog)) - console.log(fs.readFileSync(squirrelLog)); + console.log(fs.readFileSync(squirrelLog, 'utf8')); } process.exit(error ? 1 : 0); }); From 631acbd8d487d19173cc376a3d055a036919b782 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 1 Apr 2015 11:02:12 -0700 Subject: [PATCH 06/10] Log location --- script/cibuild | 1 + 1 file changed, 1 insertion(+) diff --git a/script/cibuild b/script/cibuild index e418d1a15..e9da6232a 100755 --- a/script/cibuild +++ b/script/cibuild @@ -93,6 +93,7 @@ cp.safeExec.bind(global, 'npm install npm --loglevel error', {cwd: path.resolve( if (error && process.platform === 'win32') { var fs = require('fs'); var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); + console.log(squirrelLog, fs.existsSync(squirrelLog)); if (fs.existsSync(squirrelLog)) console.log(fs.readFileSync(squirrelLog, 'utf8')); } From 7027f8619c32a20753fcd15128bb66af3e90083b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 1 Apr 2015 11:18:41 -0700 Subject: [PATCH 07/10] Always log squirrel log --- script/cibuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/script/cibuild b/script/cibuild index e9da6232a..1e45aa84e 100755 --- a/script/cibuild +++ b/script/cibuild @@ -90,13 +90,13 @@ cp.safeExec.bind(global, 'npm install npm --loglevel error', {cwd: path.resolve( cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'), ] async.series(tasks, function(error) { - if (error && process.platform === 'win32') { - var fs = require('fs'); - var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); - console.log(squirrelLog, fs.existsSync(squirrelLog)); - if (fs.existsSync(squirrelLog)) - console.log(fs.readFileSync(squirrelLog, 'utf8')); - } + console.log('DONE-----'); + var fs = require('fs'); + var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); + console.log(squirrelLog, fs.existsSync(squirrelLog)); + if (fs.existsSync(squirrelLog)) + console.log(fs.readFileSync(squirrelLog, 'utf8')); + process.exit(error ? 1 : 0); }); })(); From f24ea101e9ba46206c79ed7529a203c4c0b02599 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 1 Apr 2015 11:21:40 -0700 Subject: [PATCH 08/10] Log squirrel log in exit handler --- script/cibuild | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/script/cibuild b/script/cibuild index 1e45aa84e..bb26b8ac9 100755 --- a/script/cibuild +++ b/script/cibuild @@ -90,14 +90,18 @@ cp.safeExec.bind(global, 'npm install npm --loglevel error', {cwd: path.resolve( cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'), ] async.series(tasks, function(error) { - console.log('DONE-----'); - var fs = require('fs'); - var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); - console.log(squirrelLog, fs.existsSync(squirrelLog)); - if (fs.existsSync(squirrelLog)) - console.log(fs.readFileSync(squirrelLog, 'utf8')); - process.exit(error ? 1 : 0); }); })(); })(); + + +process.on('exit', function() { + console.log('DONE-----'); + var fs = require('fs'); + var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); + console.log(squirrelLog, fs.existsSync(squirrelLog)); + if (fs.existsSync(squirrelLog)) + console.log(fs.readFileSync(squirrelLog, 'utf8')); + +}); From 4b90926ccf796286d6636950d7335f7cc993ec68 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 1 Apr 2015 11:38:02 -0700 Subject: [PATCH 09/10] Log errors --- script/cibuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/script/cibuild b/script/cibuild index bb26b8ac9..9358cc09c 100755 --- a/script/cibuild +++ b/script/cibuild @@ -98,10 +98,14 @@ cp.safeExec.bind(global, 'npm install npm --loglevel error', {cwd: path.resolve( process.on('exit', function() { console.log('DONE-----'); - var fs = require('fs'); - var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); - console.log(squirrelLog, fs.existsSync(squirrelLog)); - if (fs.existsSync(squirrelLog)) - console.log(fs.readFileSync(squirrelLog, 'utf8')); + try { + var fs = require('fs'); + var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); + console.log(squirrelLog, fs.existsSync(squirrelLog)); + if (fs.existsSync(squirrelLog)) + console.log(fs.readFileSync(squirrelLog, 'utf8')); + } catch (error) { + console.error(error.message); + } }); From b44b4a237269e26e73c49522cd8f2d13a310907f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 1 Apr 2015 11:58:22 -0700 Subject: [PATCH 10/10] Remove squirrel log output --- script/cibuild | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/script/cibuild b/script/cibuild index 9358cc09c..08ff65c6e 100755 --- a/script/cibuild +++ b/script/cibuild @@ -94,18 +94,3 @@ cp.safeExec.bind(global, 'npm install npm --loglevel error', {cwd: path.resolve( }); })(); })(); - - -process.on('exit', function() { - console.log('DONE-----'); - try { - var fs = require('fs'); - var squirrelLog = path.resolve(__dirname, '..', 'build', 'node_modules', 'grunt-atom-shell-installer', 'vendor', 'SquirrelSetup.log'); - console.log(squirrelLog, fs.existsSync(squirrelLog)); - if (fs.existsSync(squirrelLog)) - console.log(fs.readFileSync(squirrelLog, 'utf8')); - } catch (error) { - console.error(error.message); - } - -});