Fetch the correct history in the cherryPick.yml workflow

Author: roryabraham

.github/workflows/cherryPick.yml

@@ -43,34 +43,47 @@ jobs:
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
-      - name: Get merge commit for CP pull request
+      - name: Get version bump commit
+        id: getVersionBumpCommit
+        run: |
+          # Find the commit for the version-bump
+          # This command fetches commits in the last hour on the main branch
+          git fetch origin main --no-tags --shallow-since="$(( $(date +%s) - 3600 ))"
+          git switch main
+          VERSION_BUMP_COMMIT="$(git log --format='%H' --author='OSBotify' --grep 'Update version to ${{ needs.createNewVersion.outputs.NEW_VERSION }}')"
+          echo "VERSION_BUMP_SHA=$VERSION_BUMP_COMMIT" >> "$GITHUB_OUTPUT"
+
+      - name: Get merge commit for pull request to CP
         id: getCPMergeCommit
         uses: Expensify/App/.github/actions/javascript/getPullRequestDetails@main
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           USER: ${{ github.actor }}
           PULL_REQUEST_NUMBER: ${{ github.event.inputs.PULL_REQUEST_NUMBER }}
 
-      - name: Cherry-pick the version-bump to staging
+      - name: Get previous app version
+        id: getPreviousVersion
+        uses: Expensify/App/.github/actions/javascript/getPreviousVersion@main
+        with:
+          SEMVER_LEVEL: 'PATCH'
+
+      - name: Fetch history of relevant refs
         run: |
-          # Find the commit for the version-bump
-          # This command fetches commits in the last hour on the main branch
-          git fetch origin main --no-tags --shallow-since="$(( $(date +%s) - 3600 ))"
-          git switch main
-          VERSION_BUMP_COMMIT="$(git log --format='%H' --author='OSBotify' --grep 'Update version to ${{ needs.createNewVersion.outputs.NEW_VERSION }}')"
+          git fetch origin \
+            staging \
+            ${{ steps.getVersionBumpCommit.outputs.VERSION_BUMP_SHA }} \
+            ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }} \
+            --no-tags
+            --shallow-exclude ${{ steps.getPreviousVersion.outputs.PREVIOUS_VERSION }}
 
-          # Cherry-pick it to staging
+      - name: Cherry-pick the version-bump to staging
+        run: |
           git switch staging
-          git cherry-pick -S -x --mainline 1 --strategy=recursive -Xtheirs "$VERSION_BUMP_COMMIT"
+          git cherry-pick -S -x --mainline 1 --strategy=recursive -Xtheirs ${{ steps.getVersionBumpCommit.outputs.VERSION_BUMP_SHA }}
 
       - name: Cherry-pick the merge commit of target PR
         id: cherryPick
         run: |
-          if ! git rev-parse --verify ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }} 2>/dev/null; then
-            echo "Merge commit of PR #${{ github.event.inputs.PULL_REQUEST_NUMBER }} (${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}) not found, fetching it now..."
-            git fetch origin ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }} --no-tags --depth=1
-          fi
-
           echo "Attempting to cherry-pick ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}"
           if git cherry-pick -S -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}; then
             echo "🎉 No conflicts! CP was a success, PR can be automerged 🎉"