From afc95ff2fbc68a19c034ed88f363cfdb3c1ab786 Mon Sep 17 00:00:00 2001
From: Rory Abraham <rory@expensify.com>
Date: Wed, 11 Aug 2021 14:03:16 -0700
Subject: [PATCH] Fix deploy comments for regular staging deploys

---
 .github/actions/markPullRequestsAsDeployed/index.js             | 2 +-
 .../markPullRequestsAsDeployed/markPullRequestsAsDeployed.js    | 2 +-
 .github/workflows/platformDeploy.yml                            | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/actions/markPullRequestsAsDeployed/index.js b/.github/actions/markPullRequestsAsDeployed/index.js
index 62e3226a4cb6a..72281d6a20fc9 100644
--- a/.github/actions/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/markPullRequestsAsDeployed/index.js
@@ -129,7 +129,7 @@ const run = function () {
                     let deployer = lodashGet(response, 'data.merged_by.login', '');
                     const CPActorMatches = data.message
                         .match(/Merge pull request #\d+ from Expensify\/(.+)-cherry-pick-staging-\d+/);
-                    if (CPActorMatches.length === 2 && CPActorMatches[1] !== 'OSBotify') {
+                    if (_.isArray(CPActorMatches) && CPActorMatches.length === 2 && CPActorMatches[1] !== 'OSBotify') {
                         deployer = CPActorMatches[1];
                     }
 
diff --git a/.github/actions/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js b/.github/actions/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js
index c947b34f61010..9c4d27d63baf4 100644
--- a/.github/actions/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js
+++ b/.github/actions/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js
@@ -119,7 +119,7 @@ const run = function () {
                     let deployer = lodashGet(response, 'data.merged_by.login', '');
                     const CPActorMatches = data.message
                         .match(/Merge pull request #\d+ from Expensify\/(.+)-cherry-pick-staging-\d+/);
-                    if (CPActorMatches.length === 2 && CPActorMatches[1] !== 'OSBotify') {
+                    if (_.isArray(CPActorMatches) && CPActorMatches.length === 2 && CPActorMatches[1] !== 'OSBotify') {
                         deployer = CPActorMatches[1];
                     }
 
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 3c85ac4a1d019..abb1866a3ba4b 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -354,7 +354,6 @@ jobs:
         with:
           PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }}
           IS_PRODUCTION_DEPLOY: ${{ env.SHOULD_DEPLOY_PRODUCTION == 'true' }}
-          STAGING_DEPLOY_NUMBER: ${{ steps.isStagingDeployLocked.outputs.NUMBER }}
           DEPLOY_VERSION: ${{ env.VERSION }}
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           ANDROID: ${{ needs.android.result }}