diff --git a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/index-preverify-pr.ts b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/index-preverify-pr.ts index cedae675c4..24126d00b1 100644 --- a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/index-preverify-pr.ts +++ b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/index-preverify-pr.ts @@ -18,8 +18,8 @@ function _main() { // Exit codes: // - 0: The PR author is a member. - // - 1: The PR author is not a member. - // - 2: An error occurred. + // - 1: An error occurred. + // - 2: The PR author is not a member. buildVerifier.getPrAuthorTeamMembership(pr). then(({author, isMember}) => { if (isMember) { @@ -27,10 +27,10 @@ function _main() { } else { const errorMessage = `User '${author}' is not an active member of any of the following teams: ` + `${allowedTeamSlugs.join(', ')}`; - onError(errorMessage, 1); + onError(errorMessage, 2); } }). - catch(err => onError(err, 2)); + catch(err => onError(err, 1)); } function onError(err: string, exitCode: number) { diff --git a/aio/scripts/deploy-preview.sh b/aio/scripts/deploy-preview.sh index 72589e9e91..9e11604aa0 100755 --- a/aio/scripts/deploy-preview.sh +++ b/aio/scripts/deploy-preview.sh @@ -27,17 +27,17 @@ case $preverifyExitCode in # Preconditions met: Deploy ;; 1) + # An error occurred: Fail the script + exit 1 + ;; + 2) # Preconditions not met: Skip deploy echo "Skipping deploy because this PR did not meet the preconditions." exit 0 ;; - 2) - # An error occurred: Fail the script - exit 1 - ;; *) # Unexpected exit code: Fail the script - echo "Unexpected preverification exit code: $preverifyExitCode" + echo "Unexpected pre-verification exit code: $preverifyExitCode" exit 1 ;; esac