From 755b5b5932afed78a76c7b7a4010e0c53ea34b41 Mon Sep 17 00:00:00 2001 From: Jon Reginbald Ivarsson Date: Mon, 27 Jul 2020 11:02:17 +0000 Subject: [PATCH 1/2] Changed isMaster to isPr and baseSha condition Changed isMaster to isPr to better reflect the input variable from the azure-pipelines.yml file. Fixed baseSha condition. --- tools/scripts/calculate-commands.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scripts/calculate-commands.js b/tools/scripts/calculate-commands.js index e770ac4d..bad1b47e 100644 --- a/tools/scripts/calculate-commands.js +++ b/tools/scripts/calculate-commands.js @@ -1,6 +1,6 @@ const execSync = require('child_process').execSync; -const isMaster = process.argv[2] === 'False'; -const baseSha = isMaster ? 'origin/master~1' : 'origin/master'; +const isPr = process.argv[2] === 'True'; +const baseSha = isPr ? 'origin/master~1' : 'origin/master'; console.log( JSON.stringify({ From 6b5f7b437315c17d6a0762c4c460e234a11877ea Mon Sep 17 00:00:00 2001 From: Jon Reginbald Ivarsson Date: Mon, 27 Jul 2020 11:09:13 +0000 Subject: [PATCH 2/2] Fixed baseSha condition --- tools/scripts/calculate-commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scripts/calculate-commands.js b/tools/scripts/calculate-commands.js index bad1b47e..2a8ec2f0 100644 --- a/tools/scripts/calculate-commands.js +++ b/tools/scripts/calculate-commands.js @@ -1,6 +1,6 @@ const execSync = require('child_process').execSync; const isPr = process.argv[2] === 'True'; -const baseSha = isPr ? 'origin/master~1' : 'origin/master'; +const baseSha = isPr ? 'origin/master' : 'origin/master~1'; console.log( JSON.stringify({