Merge pull request #60378 from Expensify/andrew-cherry-url

Adjust `cherryPick.yml` to take a URL instead of a PR number

(cherry picked from commit 8301b6e)

(CP triggered by roryabraham)

Author: roryabraham

.github/workflows/cherryPick.yml

@@ -3,8 +3,8 @@ name: Cherry-pick a pull request
 on:
   workflow_dispatch:
     inputs:
-      PULL_REQUEST_NUMBER:
-        description: The number of a pull request to CP
+      PULL_REQUEST_URL:
+        description: The full URL of the Expensify/App pull request to cherry-pick
         required: true
 
 jobs:
@@ -15,9 +15,6 @@ jobs:
   cherryPick:
     needs: createNewVersion
     runs-on: ubuntu-latest
-    env:
-      # The name of the branch created if there are conflicts when CPing the PR.
-      CONFLICT_BRANCH_NAME: cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }}-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - name: Checkout staging branch
         # v4
@@ -27,6 +24,23 @@ jobs:
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
           submodules: true
 
+      - name: Extract PR information
+        id: getPRInfo
+        run: |
+          echo "REPO_FULL_NAME=$(echo '${{ github.event.inputs.PULL_REQUEST_URL }}' | sed -E 's|https://github.com/([^/]+/[^/]+)/pull/.*|\1|')" >> "$GITHUB_OUTPUT"
+          echo "PR_NUMBER=$(echo '${{ github.event.inputs.PULL_REQUEST_URL }}' | sed -E 's|.*/pull/([0-9]+).*|\1|')" >> "$GITHUB_OUTPUT"
+
+      - name: Verify repository
+        run: |
+          if [ "${{ steps.getPRInfo.outputs.REPO_FULL_NAME }}" != "Expensify/App" ]; then
+            echo "::error::❌ Cherry picks are only supported for the Expensify/App repository. Found: ${{ steps.getPRInfo.outputs.REPO_FULL_NAME }}"
+            exit 1
+          fi
+
+      - name: Set conflict branch name
+        id: getBranchName
+        run: echo "CONFLICT_BRANCH_NAME=cherry-pick-staging-${{ steps.getPRInfo.outputs.PR_NUMBER }}-${{ github.run_id }}-${{ github.run_attempt }}" >> "$GITHUB_OUTPUT"
+
       # This command is necessary to fetch any branch other than main in the submodule.
       # See https://github.com/actions/checkout/issues/1815#issuecomment-2777836442 for further context.
       - name: Enable branch-switching in submodules
@@ -100,7 +114,7 @@ jobs:
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           USER: ${{ github.actor }}
-          PULL_REQUEST_NUMBER: ${{ github.event.inputs.PULL_REQUEST_NUMBER }}
+          PULL_REQUEST_NUMBER: ${{ steps.getPRInfo.outputs.PR_NUMBER }}
 
       - name: Cherry-pick the Mobile-Expensify version bump to Mobile-Expensify staging
         working-directory: Mobile-Expensify
@@ -137,8 +151,8 @@ jobs:
       - name: Push changes
         run: |
           if [[ ${{steps.cherryPick.outputs.HAS_CONFLICTS}} == 'true' ]]; then
-            git checkout -b ${{ env.CONFLICT_BRANCH_NAME }}
-            git push --set-upstream origin ${{ env.CONFLICT_BRANCH_NAME }}
+            git checkout -b ${{ steps.getBranchName.outputs.CONFLICT_BRANCH_NAME }}
+            git push --set-upstream origin ${{ steps.getBranchName.outputs.CONFLICT_BRANCH_NAME }}
           else
             git push origin staging
           fi
@@ -150,13 +164,13 @@ jobs:
           AUTHOR_CHECKLIST=$(sed -n '/### PR Author Checklist/,$p' .github/PULL_REQUEST_TEMPLATE.md)
 
           PR_DESCRIPTION=$(cat <<EOF
-          🍒 Cherry pick https://github.com/Expensify/App/pull/${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 🍒
+          🍒 Cherry pick ${{ github.event.inputs.PULL_REQUEST_URL }} to staging 🍒
 
           This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:
 
           \`\`\`bash
           git fetch
-          git checkout ${{ env.CONFLICT_BRANCH_NAME }}
+          git checkout ${{ steps.getBranchName.outputs.CONFLICT_BRANCH_NAME }}
           git cherry-pick -S -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}
           \`\`\`
 
@@ -166,7 +180,7 @@ jobs:
           git commit --amend -m "\$(git log -1 --pretty=%B)" -m "(CP triggered by ${{ github.actor }})"
           \`\`\`
 
-          That will help us keep track of who triggered this CP. Once all that's done, push your changes with \`git push origin ${{ env.CONFLICT_BRANCH_NAME }}\`, and then open this PR for review.
+          That will help us keep track of who triggered this CP. Once all that's done, push your changes with \`git push origin ${{ steps.getBranchName.outputs.CONFLICT_BRANCH_NAME }}\`, and then open this PR for review.
 
           Note that you **must** test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.
 
@@ -178,7 +192,7 @@ jobs:
 
           # Create PR
           gh pr create \
-            --title "🍒 Cherry pick PR #${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 🍒" \
+            --title "🍒 Cherry pick PR #${{ steps.getPRInfo.outputs.PR_NUMBER }} to staging 🍒" \
             --body "$PR_DESCRIPTION" \
             --label "Engineering,Hourly" \
             --base "staging"
@@ -190,15 +204,15 @@ jobs:
         if: fromJSON(steps.cherryPick.outputs.HAS_CONFLICTS)
         run: |
           gh pr edit --add-assignee "${{ github.actor }},${{ steps.getCPMergeCommit.outputs.MERGE_ACTOR }}"
-          ORIGINAL_PR_AUTHOR="$(gh pr view ${{ github.event.inputs.PULL_REQUEST_NUMBER }} --json author --jq .author.login)"
+          ORIGINAL_PR_AUTHOR="$(gh pr view ${{ github.event.inputs.PULL_REQUEST_URL }} --json author --jq .author.login)"
           gh pr edit --add-assignee "$ORIGINAL_PR_AUTHOR"
         env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
         # In cases when the original PR author is outside the org, the `gh pr edit` command will fail. But we don't want to fail the workflow in that case.
         continue-on-error: true
 
       - name: Label original PR with CP Staging
-        run: gh pr edit ${{ inputs.PULL_REQUEST_NUMBER }} --add-label 'CP Staging'
+        run: gh pr edit ${{  github.event.inputs.PULL_REQUEST_URL }} --add-label 'CP Staging'
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
@@ -214,7 +228,7 @@ jobs:
               attachments: [{
                 color: "#DB4545",
                 pretext: `<!subteam^S4TJJ3PSL>`,
-                text: `💥 Failed to CP https://github.com/Expensify/App/pull/${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 💥`,
+                text: `💥 Failed to CP ${{ github.event.inputs.PULL_REQUEST_URL }} to staging 💥`,
               }]
             }
         env: