From cf56c01bda858e03e60a8f5a773ae3009c6cd820 Mon Sep 17 00:00:00 2001
From: Rory Abraham <rory@expensify.com>
Date: Mon, 30 Aug 2021 10:39:13 -0700
Subject: [PATCH 1/2] Add string comparison to boolean expressions

---
 .github/workflows/cherryPick.yml         |  4 ++--
 .github/workflows/finishReleaseCycle.yml | 10 +++++-----
 .github/workflows/platformDeploy.yml     |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
index afa7b2254f2..0ab0188ceda 100644
--- a/.github/workflows/cherryPick.yml
+++ b/.github/workflows/cherryPick.yml
@@ -27,7 +27,7 @@ jobs:
   createNewVersion:
     needs: validateActor
     runs-on: ubuntu-latest
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER && github.event.inputs.NEW_VERSION == '' }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' && github.event.inputs.NEW_VERSION == '' }}
     outputs:
       NEW_VERSION: ${{ steps.getNewVersion.outputs.NEW_VERSION }}
     steps:
@@ -59,7 +59,7 @@ jobs:
 
   cherryPick:
     needs: [validateActor, createNewVersion]
-    if: ${{ always() && needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ always() && needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: ubuntu-latest
     steps:
       # Version: 2.3.4
diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml
index 89836323871..12851879458 100644
--- a/.github/workflows/finishReleaseCycle.yml
+++ b/.github/workflows/finishReleaseCycle.yml
@@ -23,7 +23,7 @@ jobs:
           team: mobile-deployers
 
       - name: Reopen and comment on issue
-        if: ${{ !steps.validateActor.outputs.isTeamMember }}
+        if: ${{ steps.validateActor.outputs.isTeamMember == 'false' }}
         uses: Expensify/App/.github/actions/reopenIssueWithComment@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -33,7 +33,7 @@ jobs:
             Reopening!
 
       - name: Check for any deploy blockers
-        if: ${{ steps.validateActor.outputs.isTeamMember }}
+        if: ${{ steps.validateActor.outputs.isTeamMember == 'true' }}
         id: checkDeployBlockers
         uses: Expensify/App/.github/actions/checkDeployBlockers@main
         with:
@@ -41,7 +41,7 @@ jobs:
           ISSUE_NUMBER: ${{ github.event.issue.number }}
 
       - name: Reopen and comment on issue
-        if: ${{ steps.validateActor.outputs.isTeamMember && steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'true' }}
+        if: ${{ steps.validateActor.outputs.isTeamMember == 'false' && steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'true' }}
         uses: Expensify/App/.github/actions/reopenIssueWithComment@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -54,7 +54,7 @@ jobs:
   updateProduction:
     runs-on: ubuntu-latest
     needs: validate
-    if: ${{ needs.validate.outputs.isValid }}
+    if: ${{ needs.validate.outputs.isValid == 'true' }}
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
         with:
@@ -72,7 +72,7 @@ jobs:
   createNewStagingDeployCash:
     runs-on: macos-11
     needs: validate
-    if: ${{ needs.validate.outputs.isValid }}
+    if: ${{ needs.validate.outputs.isValid == 'true' }}
     steps:
       # Version: 2.3.4
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 1279137e22a..7480eb2ac30 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -28,7 +28,7 @@ jobs:
   android:
     name: Build and deploy Android
     needs: validateActor
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -92,7 +92,7 @@ jobs:
   desktop:
     name: Build and deploy Desktop
     needs: validateActor
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
@@ -148,7 +148,7 @@ jobs:
   iOS:
     name: Build and deploy iOS
     needs: validateActor
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
@@ -232,7 +232,7 @@ jobs:
   web:
     name: Build and deploy Web
     needs: validateActor
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

From a615b7409948a0dee8a724131d1dcc44ad69123f Mon Sep 17 00:00:00 2001
From: Rory Abraham <rory@expensify.com>
Date: Mon, 30 Aug 2021 11:19:30 -0700
Subject: [PATCH 2/2] Fix incorrect boolean check swap

---
 .github/workflows/finishReleaseCycle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml
index 12851879458..d272f1c3de0 100644
--- a/.github/workflows/finishReleaseCycle.yml
+++ b/.github/workflows/finishReleaseCycle.yml
@@ -41,7 +41,7 @@ jobs:
           ISSUE_NUMBER: ${{ github.event.issue.number }}
 
       - name: Reopen and comment on issue
-        if: ${{ steps.validateActor.outputs.isTeamMember == 'false' && steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'true' }}
+        if: ${{ steps.validateActor.outputs.isTeamMember == 'true' && steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'true' }}
         uses: Expensify/App/.github/actions/reopenIssueWithComment@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}