Merge branch 'main' into Rory-UseSetupNodeCache

Expensify · Jul 12, 2022 · 323554f · 323554f
2 parents 6eedd58 + 23b98a7
commit 323554f
Show file tree

Hide file tree

Showing 59 changed files with 662 additions and 33,771 deletions.
diff --git a/.github/actions/composite/updateProtectedBranch/action.yml b/.github/actions/composite/updateProtectedBranch/action.yml
@@ -51,11 +51,14 @@ runs:
       with:
         GPG_PASSPHRASE: ${{ inputs.GPG_PASSPHRASE }}
 
-    - name: Checkout source branch
+    - name: Update target and source branches
       shell: bash
       run: |
         git fetch
+        git checkout ${{ inputs.TARGET_BRANCH }}
+        git merge origin/${{ inputs.TARGET_BRANCH }}
         git checkout ${{ env.SOURCE_BRANCH }}
+        git merge origin/${{ env.SOURCE_BRANCH }}
 
     - name: Set New Version
       shell: bash

diff --git a/.github/actions/getDeployPullRequestList/action.yml b/.github/actions/getDeployPullRequestList/action.yml
diff --git a/.github/actions/getDeployPullRequestList/getDeployPullRequestList.js b/.github/actions/getDeployPullRequestList/getDeployPullRequestList.js