resolve conflict

Author: nkdengineer

.env.example

@@ -36,3 +36,5 @@ EXPENSIFY_ACCOUNT_ID_MANAGER_MCTEST=-1
 FB_API_KEY=YOUR_API_KEY
 FB_APP_ID=YOUR_APP_ID
 FB_PROJECT_ID=YOUR_PROJECT_ID
+
+GITHUB_TOKEN=YOUR_TOKEN

.github/actionlint.yaml

@@ -10,7 +10,7 @@ self-hosted-runner:
 paths:
   '**/*':
     ignore:
-      # This is meant to be a temporary workaround for a bug in actionslint. Upstream:
+      # This is meant to be a temporary workaround for a bug in actionlint. Upstream:
       #    - issue: https://github.com/rhysd/actionlint/issues/511
       #    - PR: https://github.com/rhysd/actionlint/pull/513
       - '"env" is not allowed in "runs" section because .* is a Composite action.*'

.github/actions/javascript/postTestBuildComment/action.yml

@@ -4,9 +4,12 @@ inputs:
     REPO:
         description: "Repository to place a comment. Can be App or Mobile-Expensify"
         default: App
-    PR_NUMBER:
-        description: "Pull request number"
-        required: true
+    APP_PR_NUMBER:
+        description: "Pull request number for Expensify/App repository"
+        required: false
+    MOBILE_EXPENSIFY_PR_NUMBER:
+        description: "Pull request number for Expensify/Mobile-Expensify repository"
+        required: false
     GITHUB_TOKEN:
         description: "Github token for authentication"
         default: "${{ github.token }}"

.github/actions/javascript/postTestBuildComment/index.js

@@ -11501,7 +11501,7 @@ const core = __importStar(__nccwpck_require__(2186));
 const github_1 = __nccwpck_require__(5438);
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
-function getTestBuildMessage() {
+function getTestBuildMessage(appPr, mobileExpensifyPr) {
     const inputs = ['ANDROID', 'DESKTOP', 'IOS', 'WEB'];
     const names = {
         [inputs[0]]: 'Android',
@@ -11515,24 +11515,36 @@ function getTestBuildMessage() {
             acc[platform] = { link: 'N/A', qrCode: 'N/A' };
             return acc;
         }
-        const isSuccess = input === 'success';
-        const link = isSuccess ? core.getInput(`${platform}_LINK`) : '❌ FAILED ❌';
-        const qrCode = isSuccess
-            ? `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`
-            : `The QR code can't be generated, because the ${names[platform]} build failed`;
+        let link = '';
+        let qrCode = '';
+        switch (input) {
+            case 'success':
+                link = core.getInput(`${platform}_LINK`);
+                qrCode = `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`;
+                break;
+            case 'skipped':
+                link = '⏩ SKIPPED ⏩';
+                qrCode = `The build for ${names[platform]} was skipped`;
+                break;
+            default:
+                link = '❌ FAILED ❌';
+                qrCode = `The QR code can't be generated, because the ${names[platform]} build failed`;
+        }
         acc[platform] = {
             link,
             qrCode,
         };
         return acc;
     }, {});
-    const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! :test_tube::test_tube:
+    const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS${appPr ? ', Desktop, and Web' : ''}. Happy testing! :test_tube::test_tube:
+Built from${appPr ? ` App PR Expensify/App#${appPr}` : ''}${mobileExpensifyPr ? ` Mobile-Expensify PR Expensify/Mobile-Expensify#${mobileExpensifyPr}` : ''}.
 | Android :robot:  | iOS :apple: |
 | ------------- | ------------- |
-| Android :robot::arrows_counterclockwise:  | iOS :apple::arrows_counterclockwise: |
 | ${result.ANDROID.link}  | ${result.IOS.link}  |
 | ${result.ANDROID.qrCode}  | ${result.IOS.qrCode}  |
+
 | Desktop :computer: | Web :spider_web: |
+| ------------- | ------------- |
 | ${result.DESKTOP.link}  | ${result.WEB.link}  |
 | ${result.DESKTOP.qrCode}  | ${result.WEB.qrCode}  |
 
@@ -11557,17 +11569,23 @@ async function commentPR(REPO, PR, message) {
     }
 }
 async function run() {
-    const PR_NUMBER = Number(core.getInput('PR_NUMBER', { required: true }));
+    const APP_PR_NUMBER = Number(core.getInput('APP_PR_NUMBER', { required: false }));
+    const MOBILE_EXPENSIFY_PR_NUMBER = Number(core.getInput('MOBILE_EXPENSIFY_PR_NUMBER', { required: false }));
     const REPO = String(core.getInput('REPO', { required: true }));
     if (REPO !== CONST_1.default.APP_REPO && REPO !== CONST_1.default.MOBILE_EXPENSIFY_REPO) {
         core.setFailed(`Invalid repository used to place output comment: ${REPO}`);
         return;
     }
+    if ((REPO === CONST_1.default.APP_REPO && !APP_PR_NUMBER) || (REPO === CONST_1.default.MOBILE_EXPENSIFY_REPO && !MOBILE_EXPENSIFY_PR_NUMBER)) {
+        core.setFailed(`Please provide ${REPO} pull request number`);
+        return;
+    }
+    const destinationPRNumber = REPO === CONST_1.default.APP_REPO ? APP_PR_NUMBER : MOBILE_EXPENSIFY_PR_NUMBER;
     const comments = await GithubUtils_1.default.paginate(GithubUtils_1.default.octokit.issues.listComments, {
         owner: CONST_1.default.GITHUB_OWNER,
         repo: REPO,
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        issue_number: PR_NUMBER,
+        issue_number: destinationPRNumber,
         // eslint-disable-next-line @typescript-eslint/naming-convention
         per_page: 100,
     }, (response) => response.data);
@@ -11584,7 +11602,7 @@ async function run() {
             }
         `);
     }
-    await commentPR(REPO, PR_NUMBER, getTestBuildMessage());
+    await commentPR(REPO, destinationPRNumber, getTestBuildMessage(APP_PR_NUMBER, MOBILE_EXPENSIFY_PR_NUMBER));
 }
 if (require.main === require.cache[eval('__filename')]) {
     run();

.github/actions/javascript/postTestBuildComment/postTestBuildComment.ts

@@ -4,7 +4,7 @@ import type {TupleToUnion} from 'type-fest';
 import CONST from '@github/libs/CONST';
 import GithubUtils from '@github/libs/GithubUtils';
 
-function getTestBuildMessage(): string {
+function getTestBuildMessage(appPr?: number, mobileExpensifyPr?: number): string {
     const inputs = ['ANDROID', 'DESKTOP', 'IOS', 'WEB'] as const;
     const names = {
         [inputs[0]]: 'Android',
@@ -22,12 +22,21 @@ function getTestBuildMessage(): string {
                 return acc;
             }
 
-            const isSuccess = input === 'success';
-
-            const link = isSuccess ? core.getInput(`${platform}_LINK`) : '❌ FAILED ❌';
-            const qrCode = isSuccess
-                ? `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`
-                : `The QR code can't be generated, because the ${names[platform]} build failed`;
+            let link = '';
+            let qrCode = '';
+            switch (input) {
+                case 'success':
+                    link = core.getInput(`${platform}_LINK`);
+                    qrCode = `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`;
+                    break;
+                case 'skipped':
+                    link = '⏩ SKIPPED ⏩';
+                    qrCode = `The build for ${names[platform]} was skipped`;
+                    break;
+                default:
+                    link = '❌ FAILED ❌';
+                    qrCode = `The QR code can't be generated, because the ${names[platform]} build failed`;
+            }
 
             acc[platform] = {
                 link,
@@ -38,13 +47,15 @@ function getTestBuildMessage(): string {
         {} as Record<TupleToUnion<typeof inputs>, {link: string; qrCode: string}>,
     );
 
-    const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! :test_tube::test_tube:
+    const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS${appPr ? ', Desktop, and Web' : ''}. Happy testing! :test_tube::test_tube:
+Built from${appPr ? ` App PR Expensify/App#${appPr}` : ''}${mobileExpensifyPr ? ` Mobile-Expensify PR Expensify/Mobile-Expensify#${mobileExpensifyPr}` : ''}.
 | Android :robot:  | iOS :apple: |
 | ------------- | ------------- |
-| Android :robot::arrows_counterclockwise:  | iOS :apple::arrows_counterclockwise: |
 | ${result.ANDROID.link}  | ${result.IOS.link}  |
 | ${result.ANDROID.qrCode}  | ${result.IOS.qrCode}  |
+
 | Desktop :computer: | Web :spider_web: |
+| ------------- | ------------- |
 | ${result.DESKTOP.link}  | ${result.WEB.link}  |
 | ${result.DESKTOP.qrCode}  | ${result.WEB.qrCode}  |
 
@@ -72,21 +83,28 @@ async function commentPR(REPO: string, PR: number, message: string) {
 }
 
 async function run() {
-    const PR_NUMBER = Number(core.getInput('PR_NUMBER', {required: true}));
+    const APP_PR_NUMBER = Number(core.getInput('APP_PR_NUMBER', {required: false}));
+    const MOBILE_EXPENSIFY_PR_NUMBER = Number(core.getInput('MOBILE_EXPENSIFY_PR_NUMBER', {required: false}));
     const REPO = String(core.getInput('REPO', {required: true}));
 
     if (REPO !== CONST.APP_REPO && REPO !== CONST.MOBILE_EXPENSIFY_REPO) {
         core.setFailed(`Invalid repository used to place output comment: ${REPO}`);
         return;
     }
 
+    if ((REPO === CONST.APP_REPO && !APP_PR_NUMBER) || (REPO === CONST.MOBILE_EXPENSIFY_REPO && !MOBILE_EXPENSIFY_PR_NUMBER)) {
+        core.setFailed(`Please provide ${REPO} pull request number`);
+        return;
+    }
+
+    const destinationPRNumber = REPO === CONST.APP_REPO ? APP_PR_NUMBER : MOBILE_EXPENSIFY_PR_NUMBER;
     const comments = await GithubUtils.paginate(
         GithubUtils.octokit.issues.listComments,
         {
             owner: CONST.GITHUB_OWNER,
             repo: REPO,
             // eslint-disable-next-line @typescript-eslint/naming-convention
-            issue_number: PR_NUMBER,
+            issue_number: destinationPRNumber,
             // eslint-disable-next-line @typescript-eslint/naming-convention
             per_page: 100,
         },
@@ -105,7 +123,7 @@ async function run() {
             }
         `);
     }
-    await commentPR(REPO, PR_NUMBER, getTestBuildMessage());
+    await commentPR(REPO, destinationPRNumber, getTestBuildMessage(APP_PR_NUMBER, MOBILE_EXPENSIFY_PR_NUMBER));
 }
 
 if (require.main === module) {

.github/scripts/getNewPatchedRNVersion.sh

@@ -21,7 +21,7 @@ PACKAGE_VERSIONS="$(gh api "/orgs/Expensify/packages/maven/com.expensify.${PACKA
 PACKAGE_VERSIONS="$(echo "$PACKAGE_VERSIONS" | grep "$VERSION")"
 
 # Grab the highest patch version from there
-LATEST_PATCHED_VERSION="$(echo "$PACKAGE_VERSIONS" | sort | tail -n1)"
+LATEST_PATCHED_VERSION="$(echo "$PACKAGE_VERSIONS" | sort -V | tail -n1)"
 
 if [[ -n "$LATEST_PATCHED_VERSION" ]]; then
     PATCH_ITERATION=${LATEST_PATCHED_VERSION##*-}

.github/scripts/validateActionsAndWorkflows.sh

@@ -7,7 +7,7 @@ title 'Validating the Github Actions and workflows using the json schemas provid
 function downloadSchema {
   [[ $1 = 'github-action.json' ]] && SCHEMA_NAME='GitHub Action' || SCHEMA_NAME='GitHub Workflow'
   info "Downloading $SCHEMA_NAME schema..."
-  if curl "https://json.schemastore.org/$1" --output "./tempSchemas/$1" --silent; then
+  if curl "https://raw.githubusercontent.com/SchemaStore/schemastore/refs/heads/master/src/schemas/json/$1" --output "./tempSchemas/$1" --silent; then
     success "Successfully downloaded $SCHEMA_NAME schema!"
   else
     error "Failed downloading $SCHEMA_NAME schema"

.github/workflows/cherryPick.yml

@@ -237,7 +237,7 @@ jobs:
           gh pr create \
             --title "🍒 Cherry pick PR #${{ steps.getPRInfo.outputs.PR_NUMBER }} to ${{ inputs.TARGET }} 🍒" \
             --body "$PR_DESCRIPTION" \
-            --label "Engineering,Hourly" \
+            --label "Engineering,Hourly,${{ inputs.TARGET == 'staging' && 'CP Staging' || 'CP Production' }}" \
             --base "${{ inputs.TARGET }}"
           sleep 5
         env:

.github/workflows/deploy.yml

@@ -273,7 +273,7 @@ jobs:
               attachments: [{
                 color: "#DB4545",
                 pretext: `<!subteam^S4TJJ3PSL>`,
-                text: `💥 Android HybridApp production <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|deploy run> failed. Please <https://stackoverflowteams.com/c/expensify/questions/5738|manually submit> ${{ needs.prep.outputs.APP_VERSION }} in the <https://play.google.com/console/u/0/developers/8765590895836334604/app/4974129597497161901/releases/overview|Google Play Store>. 💥 But first check the workflow, it's likely that the release was successful and <https://github.com/Expensify/Expensify/issues/488492|this error> is occuring)`,
+                text: `💥 Android HybridApp production <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|deploy run> failed. Please <https://stackoverflowteams.com/c/expensify/questions/5738|manually submit> ${{ needs.prep.outputs.APP_VERSION }} in the <https://play.google.com/console/u/0/developers/8765590895836334604/app/4974129597497161901/releases/overview|Google Play Store> 💥`,
               }]
             }
         env:

.github/workflows/lint-changed.yml

@@ -17,19 +17,47 @@ jobs:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
+      - name: Count commits between merge base and HEAD
+        id: count
+        run: |
+          # Compare the base commit and HEAD to get the count of commits after base
+          # up to and including HEAD. Add 2 to this total when fetching history. 
+          #
+          # When opening a PR, GitHub will create a merge commit that squashes
+          # your changes for use in the workflow. So your history locally
+          # may look like
+          #          o---o---o---B - development
+          #         /
+          # ---o---1---C---o---o---A - main
+          # Note that the `1` is the merge-base of development and main. The
+          # number of commits after `1` upto and including `A` is 4.
+          # In the workflow, GitHub squashs development, so it becomes:
+          # ---o---1---C---o---o---A - main
+          #                         \--M - PR branch
+          # Where `M`` is the new squashed commit. To fetch enough history to
+          # include the merge base, we need to fetch `M`, `A` through `C` and
+          # `1` for total of 4+2=6 commits. The +2 commits accounts for the
+          # base `1` and merge commit `M`.
+          RAW_COUNT="$(gh api "repos/$REPO/compare/${BASE}...main" | jq -r '.total_commits')"
+          ADJUSTED_COUNT=$((RAW_COUNT + 2))
+          echo "count=$ADJUSTED_COUNT" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          BASE: ${{ github.event.pull_request.base.sha }}
+          REPO: ${{ github.repository }}
+          
       - name: Checkout
         # v4
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        with:
+          fetch-depth: ${{ fromJSON(steps.count.outputs.count) }}
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
         with:
           IS_DESKTOP_BUILD: true
-      
+ 
       - name: Run ESLint to check for deprecation warnings
         run: |
-          # This will just fetch the latest commit from main
-          git fetch origin main --no-tags --depth=1
-
           # shellcheck disable=SC2046
           npm run lint-changed