From bc4088890cb94f999942415b4c7f7282e3c4cc2a Mon Sep 17 00:00:00 2001 From: Tyler Wanek Date: Mon, 1 Oct 2018 15:44:46 -0700 Subject: [PATCH 1/2] Run submodule updates in sequence rather than parallel Experiencing issues with config locks on electron_npg_automator. This might potentially be the cause. --- lifecycleScripts/submodules/index.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lifecycleScripts/submodules/index.js b/lifecycleScripts/submodules/index.js index 17a2e5565..8b0586de6 100644 --- a/lifecycleScripts/submodules/index.js +++ b/lifecycleScripts/submodules/index.js @@ -61,17 +61,18 @@ module.exports = function submodules() { console.warn("\nThey will not be updated."); } - return Promise.all(statuses + return statuses .filter(function(status) { return !status.onNewCommit; }) - .map(function(submoduleToUpdate) { - console.log("[nodegit] Initializing submodules"); - - return exec( - "git submodule update --init --recursive " + submoduleToUpdate.name - ); - }) - ); + .reduce(function(chainPromise, submoduleToUpdate) { + return chainPromise + .then(function() { + console.log("[nodegit] Initializing submodule", submoduleToUpdate.name); + return exec( + "git submodule update --init --recursive " + submoduleToUpdate.name + ); + }); + }, Promise.resolve()); }); }; From 14b20e541e7839310f7bf6516d9e8ffb6e463ddc Mon Sep 17 00:00:00 2001 From: Tyler Wanek Date: Mon, 1 Oct 2018 16:09:52 -0700 Subject: [PATCH 2/2] That linter though... --- lifecycleScripts/submodules/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lifecycleScripts/submodules/index.js b/lifecycleScripts/submodules/index.js index 8b0586de6..2d13d3c89 100644 --- a/lifecycleScripts/submodules/index.js +++ b/lifecycleScripts/submodules/index.js @@ -68,9 +68,13 @@ module.exports = function submodules() { .reduce(function(chainPromise, submoduleToUpdate) { return chainPromise .then(function() { - console.log("[nodegit] Initializing submodule", submoduleToUpdate.name); + console.log( + "[nodegit] Initializing submodule", + submoduleToUpdate.name + ); return exec( - "git submodule update --init --recursive " + submoduleToUpdate.name + "git submodule update --init --recursive " + + submoduleToUpdate.name ); }); }, Promise.resolve());