improve 'behind' text output

github · Feb 15, 2023 · 4c16773 · 4c16773
1 parent 14dd22b
commit 4c16773
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/__tests__/functions/prechecks.test.js b/__tests__/functions/prechecks.test.js
@@ -1297,7 +1297,7 @@ test('runs prechecks and finds the PR is BEHIND and a noop deploy and update_bra
     )
   ).toStrictEqual({
     message:
-      '### ⚠️ Cannot proceed with deployment\n\n- mergeStateStatus: `BEHIND`\n- update_branch: `warn`\n\n> Please ensure your branch is up to date with the `main` and try again',
+      '### ⚠️ Cannot proceed with deployment\n\nYour branch is behind the base branch and will need to be updated before deployments can continue.\n\n- mergeStateStatus: `BEHIND`\n- update_branch: `warn`\n\n> Please ensure your branch is up to date with the `main` branch and try again',
     status: false
   })
 })
@@ -1453,7 +1453,7 @@ test('runs prechecks and finds the PR is BEHIND and a full deploy and update_bra
     )
   ).toStrictEqual({
     message:
-      '### ⚠️ Cannot proceed with deployment\n\n- mergeStateStatus: `BEHIND`\n- update_branch: `warn`\n\n> Please ensure your branch is up to date with the `main` and try again',
+      '### ⚠️ Cannot proceed with deployment\n\nYour branch is behind the base branch and will need to be updated before deployments can continue.\n\n- mergeStateStatus: `BEHIND`\n- update_branch: `warn`\n\n> Please ensure your branch is up to date with the `main` branch and try again',
     status: false
   })
 })

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/functions/prechecks.js b/src/functions/prechecks.js
@@ -302,7 +302,7 @@ export async function prechecks(
   ) {
     // If the update_branch param is set to "warn", warn and exit
     if (update_branch === 'warn') {
-      message = `### ⚠️ Cannot proceed with deployment\n\n- mergeStateStatus: \`${mergeStateStatus}\`\n- update_branch: \`${update_branch}\`\n\n> Please ensure your branch is up to date with the \`${stable_branch}\` and try again`
+      message = `### ⚠️ Cannot proceed with deployment\n\nYour branch is behind the base branch and will need to be updated before deployments can continue.\n\n- mergeStateStatus: \`${mergeStateStatus}\`\n- update_branch: \`${update_branch}\`\n\n> Please ensure your branch is up to date with the \`${stable_branch}\` branch and try again`
       return {message: message, status: false}
     }