Merge branch 'main' of github.com:Expensify/App into fix/56077-company-card-scroll-on-select

Author: Shahidullah-Muffakir

.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts

@@ -25,7 +25,6 @@ async function run() {
             ({data}, done) => {
                 // For production deploys, look only at other production deploys.
                 // staging deploys can be compared with other staging deploys or production deploys.
-                // The reason is that the final staging release in each deploy cycle will BECOME a production release
                 const filteredData = isProductionDeploy ? data.filter((release) => !release.prerelease) : data;
 
                 // Release was in the last page, meaning the previous release is the first item in this page

.github/actions/javascript/getDeployPullRequestList/index.js

@@ -11518,7 +11518,6 @@ async function run() {
         }, ({ data }, done) => {
             // For production deploys, look only at other production deploys.
             // staging deploys can be compared with other staging deploys or production deploys.
-            // The reason is that the final staging release in each deploy cycle will BECOME a production release
             const filteredData = isProductionDeploy ? data.filter((release) => !release.prerelease) : data;
             // Release was in the last page, meaning the previous release is the first item in this page
             if (foundCurrentRelease) {

.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:

.github/workflows/deploy.yml

@@ -45,12 +45,11 @@ jobs:
         id: getAppVersion
         run: echo "VERSION=$(jq -r .version < package.json)" >> "$GITHUB_OUTPUT"
 
-      - name: Get tag name
+      - name: Get tag
         id: getTagName
         run: echo "TAG=${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && steps.getAppVersion.outputs.VERSION || format('{0}-staging', steps.getAppVersion.outputs.VERSION) }}" >> "$GITHUB_OUTPUT"
 
       - name: Create and push tag
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: |
           git tag ${{ steps.getTagName.outputs.TAG }}
           git push origin --tags
@@ -286,14 +285,14 @@ jobs:
         # v4
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
-          name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'desktop-sourcemaps-artifact' || 'desktop-staging-sourcemaps-artifact' }}
+          name: desktop-sourcemaps-artifact
           path: ./desktop/dist/www/merged-source-map.js.map
 
       - name: Upload desktop build artifact
         # v4
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
-          name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'desktop-build-artifact' || 'desktop-staging-build-artifact' }}
+          name: desktop-build-artifact
           path: ./desktop-build/NewExpensify.dmg
 
   ios:
@@ -517,7 +516,7 @@ jobs:
         # v4
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
-          name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'web' || 'web-staging' }}-sourcemaps-artifact
+          name: web-sourcemaps-artifact
           path: ./dist/merged-source-map.js.map
 
       - name: Compress web build .tar.gz and .zip
@@ -529,14 +528,14 @@ jobs:
         # v4
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
-          name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'web' || 'web-staging' }}-build-tar-gz-artifact
+          name: web-build-tar-gz-artifact
           path: ./webBuild.tar.gz
 
       - name: Upload .zip web build artifact
         # v4
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
-          name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'web' || 'web-staging' }}-build-zip-artifact
+          name: web-build-zip-artifact
           path: ./webBuild.zip
 
   postSlackMessageOnFailure:
@@ -589,97 +588,32 @@ jobs:
           echo "IS_ALL_PLATFORMS_DEPLOYED=$isAllPlatformsDeployed" >> "$GITHUB_OUTPUT"
           echo "IS_ALL_PLATFORMS_DEPLOYED is $isAllPlatformsDeployed"
 
-  createPrerelease:
+  createRelease:
     runs-on: ubuntu-latest
-    if: ${{ always() && github.ref == 'refs/heads/staging' && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
+    if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
     needs: [prep, checkDeploymentSuccess]
     steps:
+      # v4.2.1
       - name: Download all workflow run artifacts
-        # v4
         uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
 
-      - name: 🚀 Create prerelease 🚀
+      - name:  🚀 Create release 🚀
         run: |
-          gh release create ${{ needs.prep.outputs.TAG }} --repo ${{ github.repository }} --title ${{ needs.prep.outputs.APP_VERSION }} --generate-notes --prerelease --verify-tag --target staging
+          gh release create ${{ needs.prep.outputs.TAG }} ${{ github.ref == 'refs/heads/staging' && '--prerelease' }} \
+            --repo ${{ github.repository }} \
+            --title ${{ needs.prep.outputs.TAG }} \
+            --generate-notes \
+            --verify-tag \
+            --target ${{ github.ref }}
           RETRIES=0
-          MAX_RETRIES=10
+          readonly MAX_RETRIES=10
           until [[ $(gh release view ${{ needs.prep.outputs.TAG }} --repo ${{ github.repository }}) || $RETRIES -ge $MAX_RETRIES ]]; do
-            echo "release not found, retrying $((MAX_RETRIES - RETRIES++)) times"
+            echo "Release not found, retrying $((MAX_RETRIES - RETRIES++)) times"
             sleep 1
           done
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Rename web and desktop sourcemaps artifacts before assets upload in order to have unique ReleaseAsset.name
-        continue-on-error: true
-        run: |
-          mv ./desktop-staging-sourcemaps-artifact/merged-source-map.js.map ./desktop-staging-sourcemaps-artifact/desktop-staging-merged-source-map.js.map
-          mv ./web-staging-sourcemaps-artifact/merged-source-map.js.map ./web-staging-sourcemaps-artifact/web-staging-merged-source-map.js.map
-
-      - name: Upload artifacts to GitHub Release
-        continue-on-error: true
-        run: |
-          # Release asset name should follow the template: [platform]-[staging, production or blank]-[sourcemap or blank].[file extension]
-          files=(
-            "./android-build-artifact/Expensify-release.aab#android.aab"
-            "./android-apk-artifact/Expensify.apk#android.apk"
-            "./android-sourcemap-artifact/index.android.bundle.map#android-sourcemap.js.map"
-            "./desktop-staging-sourcemaps-artifact/desktop-staging-merged-source-map.js.map#desktop-staging-sourcemap.js.map"
-            "./desktop-staging-build-artifact/NewExpensify.dmg#desktop-staging.dmg"
-            "./ios-build-artifact/Expensify.ipa#ios.ipa"
-            "./ios-sourcemap-artifact/main.jsbundle.map#ios-sourcemap.js.map"
-            "./web-staging-sourcemaps-artifact/web-staging-merged-source-map.js.map#web-staging-sourcemap.js.map"
-            "./web-staging-build-tar-gz-artifact/webBuild.tar.gz#web-staging.tar.gz"
-            "./web-staging-build-zip-artifact/webBuild.zip#web-staging.zip"
-          )
-
-          # Loop through each file and upload individually (so if one fails, we still have other platforms uploaded)
-          for file_entry in "${files[@]}"; do
-            gh release upload ${{ needs.prep.outputs.TAG }} --repo ${{ github.repository }} --clobber "$file_entry" || {
-              echo "Failed to upload $file_entry. Continuing with the next file."
-              continue
-            }
-            echo "Successfully uploaded $file_entry."
-          done
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Warn deployers if staging deploy failed
-        if: ${{ failure() }}
-        # v3
-        uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e
-        with:
-          status: custom
-          custom_payload: |
-            {
-              channel: '#deployer',
-              attachments: [{
-                color: "#DB4545",
-                pretext: `<!subteam^S4TJJ3PSL>`,
-                text: `💥 NewDot staging deploy failed. 💥`,
-              }]
-            }
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-
-  finalizeRelease:
-    runs-on: ubuntu-latest
-    if: ${{ always() && github.ref == 'refs/heads/production' && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
-    needs: [prep, checkDeploymentSuccess]
-    steps:
-      - name: Download all workflow run artifacts
-        # v4
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
-
-      - name: 🚀 Edit the release to be no longer a prerelease 🚀
-        run: |
-          LATEST_RELEASE="$(gh release list --repo ${{ github.repository }} --exclude-pre-releases --json tagName,isLatest --jq '.[] | select(.isLatest) | .tagName')"
-          gh api --method POST /repos/Expensify/App/releases/generate-notes -f "tag_name=${{ needs.prep.outputs.TAG }}" -f "previous_tag_name=$LATEST_RELEASE" | jq -r '.body' >> releaseNotes.md
-          gh release edit ${{ needs.prep.outputs.TAG }} --repo ${{ github.repository }} --prerelease=false --latest --notes-file releaseNotes.md
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
       - name: Rename web and desktop sourcemaps artifacts before assets upload in order to have unique ReleaseAsset.name
         continue-on-error: true
         run: |
@@ -689,27 +623,33 @@ jobs:
       - name: Upload artifacts to GitHub Release
         continue-on-error: true
         run: |
-          # Release asset name should follow the template: [platform]-[staging, production or blank]-[sourcemap or blank].[file extension]
-          files=(
-            "./desktop-sourcemaps-artifact/desktop-merged-source-map.js.map#desktop-production-sourcemap.js.map"
-            "./desktop-build-artifact/NewExpensify.dmg#desktop-production.dmg"
-            "./web-sourcemaps-artifact/web-merged-source-map.js.map#web-production-sourcemap.js.map"
-            "./web-build-tar-gz-artifact/webBuild.tar.gz#web-production.tar.gz"
-            "./web-build-zip-artifact/webBuild.zip#web-production.zip"
-          )
+          # Release asset name should follow the template: fileNameOnRunner#fileNameInRelease
+          files="
+            ./android-build-artifact/Expensify-release.aab#android.aab
+            ./android-apk-artifact/Expensify.apk#android.apk
+            ./android-sourcemap-artifact/index.android.bundle.map#android-sourcemap.js.map
+            ./desktop-sourcemaps-artifact/desktop-merged-source-map.js.map#desktop-sourcemap.js.map
+            ./desktop-build-artifact/NewExpensify.dmg#desktop.dmg
+            ./ios-build-artifact/Expensify.ipa#ios.ipa
+            ./ios-sourcemap-artifact/main.jsbundle.map#ios-sourcemap.js.map
+            ./web-sourcemaps-artifact/web-merged-source-map.js.map#web-sourcemap.js.map
+            ./web-build-tar-gz-artifact/webBuild.tar.gz#web.tar.gz
+            ./web-build-zip-artifact/webBuild.zip#web.zip
+          "
 
           # Loop through each file and upload individually (so if one fails, we still have other platforms uploaded)
-          for file_entry in "${files[@]}"; do
-            gh release upload ${{ needs.prep.outputs.TAG }} --repo ${{ github.repository }} --clobber "$file_entry" || {
-              echo "Failed to upload $file_entry. Continuing with the next file."
-              continue
-            }
-            echo "Successfully uploaded $file_entry."
-          done
+          # Note: Not all of these files are present for production releases, because we don't build the native apps for prod deploys. That's expected.
+          echo -e "$files" | xargs -I {} --max-procs=4 bash -c '
+            if gh release upload ${{ needs.prep.outputs.TAG }} --repo ${{ github.repository }} --clobber {}; then
+              echo "✅ Successfully uploaded {}"
+            else
+              echo "❌ Failed to upload {}"
+            fi
+          '
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Warn deployers if production deploy failed
+      - name: Warn deployers if deploy failed
         if: ${{ failure() }}
         # v3
         uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e
@@ -721,7 +661,7 @@ jobs:
               attachments: [{
                 color: "#DB4545",
                 pretext: `<!subteam^S4TJJ3PSL>`,
-                text: `💥 NewDot production deploy failed. 💥`,
+                text: `💥 NewDot ${{ github.ref == 'refs/heads/staging' && 'staging' || 'production' }} deploy failed. 💥`,
               }]
             }
         env:
@@ -732,7 +672,7 @@ jobs:
     name: Post a Slack message when all platforms deploy successfully
     runs-on: ubuntu-latest
     if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_ALL_PLATFORMS_DEPLOYED) }}
-    needs: [prep, android, desktop, ios, web, checkDeploymentSuccess, createPrerelease, finalizeRelease]
+    needs: [prep, android, desktop, ios, web, checkDeploymentSuccess, createRelease]
     steps:
       - name: 'Announces the deploy in the #announce Slack room'
         # v3
@@ -789,7 +729,7 @@ jobs:
   postGithubComments:
     uses: ./.github/workflows/postDeployComments.yml
     if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
-    needs: [prep, android, desktop, ios, web, checkDeploymentSuccess, createPrerelease, finalizeRelease]
+    needs: [prep, android, desktop, ios, web, checkDeploymentSuccess, createRelease]
     with:
       version: ${{ needs.prep.outputs.APP_VERSION }}
       env: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }}

.github/workflows/finishReleaseCycle.yml

@@ -1,4 +1,4 @@
-name: Prepare production deploy
+name: Finish release cycle
 
 on:
   issues: