|
|
@@ -2169,9 +2169,17 @@ shell_verse.acquireElevationState().then((isElevated) => { |
|
|
|
|
|
|
|
console.log('Running exlr pull : ' + path.dirname(__dirname)) |
|
|
|
|
|
|
|
if (!processedArgs.runas) gitRepos.map((def) => performPull(def, def.branch || 'master')) |
|
|
|
if (!processedArgs.runas) gitRepos.map((def) => { |
|
|
|
if (exludeMergeRepos[def.repo]) return Promise.resolve({ 'skipped': true }) |
|
|
|
else performPull(def, def.branch || 'master') |
|
|
|
}) |
|
|
|
var etask = ()=>{ |
|
|
|
return any(elevatedRunasRepos.map((def) => performPull(def, def.branch || 'master'))).then(() => { |
|
|
|
return any(elevatedRunasRepos.map((def) => |
|
|
|
{ |
|
|
|
if (exludeMergeRepos[def.repo]) return Promise.resolve({ 'skipped': true }) |
|
|
|
else performPull(def, def.branch || 'master') |
|
|
|
|
|
|
|
})).then(() => { |
|
|
|
fs.writeFileSync('run.done', 'success') |
|
|
|
}).catch(() => { |
|
|
|
fs.writeFileSync('run.done', 'error') |
|
|
@@ -2842,7 +2850,7 @@ shell_verse.acquireElevationState().then((isElevated) => { |
|
|
|
|
|
|
|
var excludeCheckouts = Object.assign(exludeMergeRepos) |
|
|
|
delete excludeCheckouts[`elixir-config-${runconfig.NODE_ENV}`] |
|
|
|
delete excludeCheckouts[`cihsr-config-${runconfig.NODE_ENV}`] |
|
|
|
// delete excludeCheckouts[`cihsr-config-${runconfig.NODE_ENV}`] |
|
|
|
|
|
|
|
var performMerge = (def) => { |
|
|
|
if (exludeMergeRepos[def.repo]) return Promise.resolve({ 'skipped': true }) |