diff --git a/.gitattributes b/.gitattributes index d42ff18354df..963cc108c6e1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ *.pbxproj -text +*.apk filter=lfs diff=lfs merge=lfs -text diff --git a/.github/actions/composite/buildAndroidAPK/action.yml b/.github/actions/composite/buildAndroidAPK/action.yml index fc280ab2a223..c6516584a9f2 100644 --- a/.github/actions/composite/buildAndroidAPK/action.yml +++ b/.github/actions/composite/buildAndroidAPK/action.yml @@ -9,7 +9,7 @@ inputs: runs: using: composite steps: - - uses: Expensify/App/.github/actions/composite/setupNode@main + - uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7 with: diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js index b165c285143f..02a75bf35e27 100644 --- a/.github/actions/javascript/authorChecklist/index.js +++ b/.github/actions/javascript/authorChecklist/index.js @@ -83,8 +83,8 @@ getNumberOfItemsFromAuthorChecklist() /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js index b2db5f0542ea..92c472ba03f4 100644 --- a/.github/actions/javascript/awaitStagingDeploys/index.js +++ b/.github/actions/javascript/awaitStagingDeploys/index.js @@ -121,8 +121,8 @@ module.exports = { /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js index c1fb62db00ac..86d36556af3c 100644 --- a/.github/actions/javascript/checkDeployBlockers/index.js +++ b/.github/actions/javascript/checkDeployBlockers/index.js @@ -88,8 +88,8 @@ module.exports = run; /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js index 561b8e61bc21..cf16c3923f80 100644 --- a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js +++ b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js @@ -161,8 +161,8 @@ module.exports = run; /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js index e42f97508bc5..05c23ab63d54 100644 --- a/.github/actions/javascript/getDeployPullRequestList/index.js +++ b/.github/actions/javascript/getDeployPullRequestList/index.js @@ -124,8 +124,8 @@ module.exports = { /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js index ce57a3d15180..ec36f796e976 100644 --- a/.github/actions/javascript/getPullRequestDetails/index.js +++ b/.github/actions/javascript/getPullRequestDetails/index.js @@ -133,8 +133,8 @@ module.exports = { /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/getReleaseBody/index.js b/.github/actions/javascript/getReleaseBody/index.js index f80eefdfabf7..0916106343ff 100644 --- a/.github/actions/javascript/getReleaseBody/index.js +++ b/.github/actions/javascript/getReleaseBody/index.js @@ -74,8 +74,8 @@ module.exports = { /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/isStagingDeployLocked/index.js b/.github/actions/javascript/isStagingDeployLocked/index.js index 847843186ff7..d5bd1a274b33 100644 --- a/.github/actions/javascript/isStagingDeployLocked/index.js +++ b/.github/actions/javascript/isStagingDeployLocked/index.js @@ -39,8 +39,8 @@ module.exports = run; /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js index 80f75137bb71..c015c1882e89 100644 --- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js +++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js @@ -204,8 +204,8 @@ module.exports = { /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/postTestBuildComment/index.js b/.github/actions/javascript/postTestBuildComment/index.js index f0bb4495f838..9a612080fc2a 100644 --- a/.github/actions/javascript/postTestBuildComment/index.js +++ b/.github/actions/javascript/postTestBuildComment/index.js @@ -83,8 +83,8 @@ module.exports = run; /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js index 076f1c53434b..4d21164ce7cd 100644 --- a/.github/actions/javascript/reopenIssueWithComment/index.js +++ b/.github/actions/javascript/reopenIssueWithComment/index.js @@ -52,8 +52,8 @@ reopenIssueWithComment() /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js index 3e35ee4f7c93..aae1e6d221ee 100644 --- a/.github/actions/javascript/reviewerChecklist/index.js +++ b/.github/actions/javascript/reviewerChecklist/index.js @@ -118,8 +118,8 @@ getNumberOfItemsFromReviewerChecklist() /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js index 115e1ccd1e4b..56d9b41bb87d 100644 --- a/.github/actions/javascript/verifySignedCommits/index.js +++ b/.github/actions/javascript/verifySignedCommits/index.js @@ -41,8 +41,8 @@ GitHubUtils.octokit.pulls /***/ ((module) => { const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/libs/CONST.js b/.github/libs/CONST.js index 36eeb804aa00..66e03af5c999 100644 --- a/.github/libs/CONST.js +++ b/.github/libs/CONST.js @@ -1,6 +1,6 @@ const CONST = { - GITHUB_OWNER: 'Expensify', - APP_REPO: 'App', + GITHUB_OWNER: 'margelo', + APP_REPO: 'expensify-app-fork', APPLAUSE_BOT: 'applausebot', OS_BOTIFY: 'OSBotify', LABELS: { diff --git a/.github/workflows/README.md b/.github/workflows/README.md index e432d9291f45..67474473650f 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -144,7 +144,7 @@ In order to bundle actions with their dependencies into a single Node.js executa - Use the absolute path of the action in GitHub, including the repo name, path, and branch ref, like so: ```yaml - name: Generate Version - uses: Expensify/App/.github/actions/javascript/bumpVersion@main + uses: margelo/expensify-app-fork/.github/actions/javascript/bumpVersion@main ``` Do not try to use a relative path. - Confusingly, paths in action metadata files (`action.yml`) _must_ use relative paths. diff --git a/.github/workflows/authorChecklist.yml b/.github/workflows/authorChecklist.yml index 33916d7bd10d..1381da044a2b 100644 --- a/.github/workflows/authorChecklist.yml +++ b/.github/workflows/authorChecklist.yml @@ -12,6 +12,6 @@ jobs: if: github.actor != 'OSBotify' steps: - name: authorChecklist.js - uses: Expensify/App/.github/actions/javascript/authorChecklist@main + uses: margelo/expensify-app-fork/.github/actions/javascript/authorChecklist@main with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml index e6da6fff1446..da872f2763fa 100644 --- a/.github/workflows/cherryPick.yml +++ b/.github/workflows/cherryPick.yml @@ -27,7 +27,7 @@ jobs: createNewVersion: needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }} - uses: Expensify/App/.github/workflows/createNewVersion.yml@main + uses: margelo/expensify-app-fork/.github/workflows/createNewVersion.yml@main secrets: inherit cherryPick: @@ -41,7 +41,7 @@ jobs: token: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Set up git for OSBotify - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab + uses: margelo/expensify-app-fork/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }} @@ -49,7 +49,7 @@ jobs: - name: Get previous app version id: getPreviousVersion - uses: Expensify/App/.github/actions/javascript/getPreviousVersion@main + uses: margelo/expensify-app-fork/.github/actions/javascript/getPreviousVersion@main with: SEMVER_LEVEL: "PATCH" @@ -66,7 +66,7 @@ jobs: - name: Get merge commit for pull request to CP id: getCPMergeCommit - uses: Expensify/App/.github/actions/javascript/getPullRequestDetails@main + uses: margelo/expensify-app-fork/.github/actions/javascript/getPullRequestDetails@main with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} USER: ${{ github.actor }} diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index c9c97d5355fb..cfa3219aa0b0 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -76,7 +76,7 @@ jobs: token: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }} - name: Setup git for OSBotify - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab + uses: margelo/expensify-app-fork/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab id: setupGitForOSBotify with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} @@ -85,7 +85,7 @@ jobs: - name: Generate version id: bumpVersion - uses: Expensify/App/.github/actions/javascript/bumpVersion@main + uses: margelo/expensify-app-fork/.github/actions/javascript/bumpVersion@main with: GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }} SEMVER_LEVEL: ${{ inputs.SEMVER_LEVEL }} @@ -105,6 +105,6 @@ jobs: - name: Announce failed workflow in Slack if: ${{ failure() }} - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main + uses: margelo/expensify-app-fork/.github/actions/composite/announceFailedWorkflowInSlack@main with: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 78040f237689..64c292ef1511 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,8 +14,8 @@ jobs: with: ref: staging token: ${{ secrets.OS_BOTIFY_TOKEN }} - - - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab + + - uses: margelo/expensify-app-fork/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab id: setupGitForOSBotify with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} @@ -38,7 +38,7 @@ jobs: ref: production token: ${{ secrets.OS_BOTIFY_TOKEN }} - - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab + - uses: margelo/expensify-app-fork/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab id: setupGitForOSBotify with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} @@ -50,7 +50,7 @@ jobs: - name: Get Release Pull Request List id: getReleasePRList - uses: Expensify/App/.github/actions/javascript/getDeployPullRequestList@main + uses: margelo/expensify-app-fork/.github/actions/javascript/getDeployPullRequestList@main with: TAG: ${{ env.PRODUCTION_VERSION }} GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }} @@ -58,7 +58,7 @@ jobs: - name: Generate Release Body id: getReleaseBody - uses: Expensify/App/.github/actions/javascript/getReleaseBody@main + uses: margelo/expensify-app-fork/.github/actions/javascript/getReleaseBody@main with: PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }} diff --git a/.github/workflows/deployBlocker.yml b/.github/workflows/deployBlocker.yml index f42d19ca8241..dc8ec1688b8a 100644 --- a/.github/workflows/deployBlocker.yml +++ b/.github/workflows/deployBlocker.yml @@ -26,17 +26,17 @@ jobs: echo "DEPLOY_BLOCKER_TITLE=$(sed -e "s/'/'\\\\''/g; s/\`/\\\\\`/g; 1s/^/'/; \$s/\$/'/" <<< "$TITLE")";} >> "$GITHUB_ENV" - name: Update StagingDeployCash with new deploy blocker - uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main + uses: margelo/expensify-app-fork/.github/actions/javascript/createOrUpdateStagingDeploy@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Give the issue/PR the Hourly, Engineering labels uses: andymckay/labeler@978f846c4ca6299fd136f465b42c5e87aca28cac with: - add-labels: 'Hourly, Engineering' - remove-labels: 'Daily, Weekly, Monthly' + add-labels: "Hourly, Engineering" + remove-labels: "Daily, Weekly, Monthly" - - name: 'Post the issue in the #expensify-open-source slack room' + - name: "Post the issue in the #expensify-open-source slack room" if: ${{ success() }} uses: 8398a7/action-slack@v3 with: @@ -66,6 +66,6 @@ jobs: - name: Announce failed workflow in Slack if: ${{ failure() }} - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main + uses: margelo/expensify-app-fork/.github/actions/composite/announceFailedWorkflowInSlack@main with: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/deployExpensifyHelp.yml b/.github/workflows/deployExpensifyHelp.yml index ca7345ef9462..bca7bdfed048 100644 --- a/.github/workflows/deployExpensifyHelp.yml +++ b/.github/workflows/deployExpensifyHelp.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - name: Setup NodeJS - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Setup Pages uses: actions/configure-pages@f156874f8191504dae5b037505266ed5dda6c382 diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml index 308404b74bc0..d6d2f9b7aa1f 100644 --- a/.github/workflows/e2ePerformanceTests.yml +++ b/.github/workflows/e2ePerformanceTests.yml @@ -16,147 +16,30 @@ on: required: true jobs: - buildBaseline: - runs-on: ubuntu-latest-xl - name: Build apk from latest release as a baseline - outputs: - VERSION: ${{ steps.getMostRecentRelease.outputs.VERSION }} - steps: - - uses: actions/checkout@v3 - - - name: Get most recent release version - id: getMostRecentRelease - run: echo "VERSION=$(gh release list --limit 1 | awk '{ print $1 }')" >> "$GITHUB_OUTPUT" - env: - GITHUB_TOKEN: ${{ github.token }} - - - name: Check if there's an existing artifact for this baseline - id: checkForExistingArtifact - uses: xSAVIKx/artifact-exists-action@3c5206b1411c0d2fc0840f56b7140646933d9d6a - with: - name: baseline-apk-${{ steps.getMostRecentRelease.outputs.VERSION }} - - - name: Skip build if there's already an existing artifact for the baseline - if: ${{ fromJSON(steps.checkForExistingArtifact.outputs.exists) }} - run: echo 'APK for baseline ${{ steps.getMostRecentRelease.outputs.VERSION }} already exists, reusing existing build' - - - name: Checkout "Baseline" commit (last release) - if: ${{ !fromJSON(steps.checkForExistingArtifact.outputs.exists) }} - run: | - git fetch origin tag ${{ steps.getMostRecentRelease.outputs.VERSION }} --no-tags --depth=1 - git switch --detach ${{ steps.getMostRecentRelease.outputs.VERSION }} - - - name: Configure MapBox SDK - run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }} - - - name: Build APK - if: ${{ !fromJSON(steps.checkForExistingArtifact.outputs.exists) }} - uses: Expensify/App/.github/actions/composite/buildAndroidAPK@main - with: - ARTIFACT_NAME: baseline-apk-${{ steps.getMostRecentRelease.outputs.VERSION }} - - buildDelta: - runs-on: ubuntu-latest-xl - name: Build apk from delta ref - outputs: - DELTA_REF: ${{ steps.getDeltaRef.outputs.DELTA_REF }} - steps: - - uses: actions/checkout@v3 - - - name: Get pull request details - id: getPullRequestDetails - uses: Expensify/App/.github/actions/javascript/getPullRequestDetails@main - with: - GITHUB_TOKEN: ${{ github.token }} - PULL_REQUEST_NUMBER: ${{ inputs.PR_NUMBER }} - USER: ${{ github.actor }} - - - name: Merged PR - Get merge commit sha for the pull request - if: ${{ fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }} - id: getMergeCommitShaIfMergedPR - run: | - MERGE_COMMIT_SHA=${{ steps.getPullRequestDetails.outputs.MERGE_COMMIT_SHA }} - git fetch origin "$MERGE_COMMIT_SHA" --no-tags --depth=1 - echo "MERGE_COMMIT_SHA=$MERGE_COMMIT_SHA" >> "$GITHUB_OUTPUT" - env: - GITHUB_TOKEN: ${{ github.token }} - - - name: Unmerged PR - Fetch head ref of unmerged PR - if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }} - run: | - git fetch origin ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1 - - - name: Unmerged PR - Set dummy git credentials before merging - if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }} - run: | - git config --global user.email "test@test.com" - git config --global user.name "Test" - - - name: Unmerged PR - Merge pull request locally and get merge commit sha - if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }} - id: getMergeCommitShaIfUnmergedPR - run: | - git merge --allow-unrelated-histories --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} - git checkout ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} - env: - GITHUB_TOKEN: ${{ github.token }} - - - name: Determine "delta ref" - id: getDeltaRef - run: echo "DELTA_REF=${{ steps.getMergeCommitShaIfMergedPR.outputs.MERGE_COMMIT_SHA || steps.getMergeCommitShaIfUnmergedPR.outputs.MERGE_COMMIT_SHA }}" >> "$GITHUB_OUTPUT" - env: - GITHUB_TOKEN: ${{ github.token }} - - - name: Checkout "delta ref" - run: git checkout ${{ steps.getDeltaRef.outputs.DELTA_REF }} - - - name: Configure MapBox SDK - run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }} - - - name: Build APK - uses: Expensify/App/.github/actions/composite/buildAndroidAPK@main - with: - ARTIFACT_NAME: delta-apk-${{ steps.getDeltaRef.outputs.DELTA_REF }} - runTestsInAWS: runs-on: ubuntu-latest - needs: [buildBaseline, buildDelta] name: Run E2E tests in AWS device farm steps: - uses: actions/checkout@v3 + with: + lfs: true - name: Make zip directory for everything to send to AWS Device Farm run: mkdir zip - - name: Download baseline APK - uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b - id: downloadBaselineAPK - with: - name: baseline-apk-${{ needs.buildBaseline.outputs.VERSION }} - path: zip - - # The downloaded artifact will be a file named "app-e2e-release.apk" so we have to rename it - - name: Rename baseline APK - run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk" - - - name: Download delta APK - uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b - id: downloadDeltaAPK - with: - name: delta-apk-${{ needs.buildDelta.outputs.DELTA_REF }} - path: zip - - - name: Rename delta APK - run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-compare.apk" - - name: Copy e2e code into zip folder run: cp -r tests/e2e zip + - name: Copy apps into zip folder + run: | + cp app-e2eRelease-baseline.apk zip + cp app-e2eRelease-compare.apk zip + - name: Zip everything in the zip directory up run: zip -qr App.zip ./zip - name: Configure AWS Credentials - uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main + uses: margelo/expensify-app-fork/.github/actions/composite/configureAwsCredentials@main with: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -190,7 +73,6 @@ jobs: - name: Print AWS Device Farm verbose run results if: ${{ always() && runner.debug != null && fromJSON(runner.debug) }} run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/debug.log" - # TODO: Once tests are more reliable we should uncomment this # - name: Check if test failed, if so post the results and add the DeployBlocker label # run: | diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml index 4fe6249edacc..3c38f3ab7534 100644 --- a/.github/workflows/finishReleaseCycle.yml +++ b/.github/workflows/finishReleaseCycle.yml @@ -18,7 +18,7 @@ jobs: ref: main token: ${{ secrets.OS_BOTIFY_TOKEN }} - - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab + - uses: margelo/expensify-app-fork/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab id: setupGitForOSBotify with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} @@ -38,7 +38,7 @@ jobs: - name: Reopen and comment on issue (not a team member) if: ${{ !fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) }} - uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main + uses: margelo/expensify-app-fork/.github/actions/javascript/reopenIssueWithComment@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} ISSUE_NUMBER: ${{ github.event.issue.number }} @@ -49,14 +49,14 @@ jobs: - name: Check for any deploy blockers if: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) }} id: checkDeployBlockers - uses: Expensify/App/.github/actions/javascript/checkDeployBlockers@main + uses: margelo/expensify-app-fork/.github/actions/javascript/checkDeployBlockers@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} ISSUE_NUMBER: ${{ github.event.issue.number }} - name: Reopen and comment on issue (has blockers) if: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) && fromJSON(steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS || 'false') }} - uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main + uses: margelo/expensify-app-fork/.github/actions/javascript/reopenIssueWithComment@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} ISSUE_NUMBER: ${{ github.event.issue.number }} @@ -66,7 +66,7 @@ jobs: - name: Announce failed workflow in Slack if: ${{ failure() }} - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main + uses: margelo/expensify-app-fork/.github/actions/composite/announceFailedWorkflowInSlack@main with: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} @@ -84,7 +84,7 @@ jobs: - name: Setup Git for OSBotify id: setupGitForOSBotify - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab + uses: margelo/expensify-app-fork/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }} @@ -100,7 +100,7 @@ jobs: - name: Announce failed workflow in Slack if: ${{ failure() }} - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main + uses: margelo/expensify-app-fork/.github/actions/composite/announceFailedWorkflowInSlack@main with: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} @@ -108,7 +108,7 @@ jobs: createNewPatchVersion: needs: validate if: ${{ fromJSON(needs.validate.outputs.isValid) }} - uses: Expensify/App/.github/workflows/createNewVersion.yml@main + uses: margelo/expensify-app-fork/.github/workflows/createNewVersion.yml@main secrets: inherit with: SEMVER_LEVEL: PATCH @@ -125,7 +125,7 @@ jobs: token: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Setup Git for OSBotify - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab + uses: margelo/expensify-app-fork/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }} @@ -141,6 +141,6 @@ jobs: - name: Announce failed workflow in Slack if: ${{ failure() }} - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main + uses: margelo/expensify-app-fork/.github/actions/composite/announceFailedWorkflowInSlack@main with: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b403a1eb737c..f3640621eafc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Lint JavaScript and Typescript with ESLint run: npm run lint diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml index 6ca025bb2a25..3d8ca3435da0 100644 --- a/.github/workflows/lockDeploys.yml +++ b/.github/workflows/lockDeploys.yml @@ -16,7 +16,7 @@ jobs: token: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Wait for staging deploys to finish - uses: Expensify/App/.github/actions/javascript/awaitStagingDeploys@main + uses: margelo/expensify-app-fork/.github/actions/javascript/awaitStagingDeploys@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} @@ -30,6 +30,6 @@ jobs: - name: Announce failed workflow if: ${{ failure() }} - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main + uses: margelo/expensify-app-fork/.github/actions/composite/announceFailedWorkflowInSlack@main with: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 1105f78da27a..0f23ee50d54d 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -4,7 +4,7 @@ name: Build and deploy android, desktop, iOS, and web clients on: push: tags: - - '*' + - "*" release: types: [created] @@ -39,14 +39,14 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Set version id: getVersion run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_OUTPUT" - name: Create or update staging deploy - uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main + uses: margelo/expensify-app-fork/.github/actions/javascript/createOrUpdateStagingDeploy@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} NPM_VERSION: ${{ steps.getVersion.outputs.VERSION }} @@ -64,12 +64,12 @@ jobs: run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }} - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Setup Ruby uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7 with: - ruby-version: '2.7' + ruby-version: "2.7" bundler-cache: true - name: Decrypt keystore @@ -145,7 +145,7 @@ jobs: uses: actions/checkout@v3 - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Decrypt Developer ID Certificate run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg @@ -187,12 +187,12 @@ jobs: run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }} - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Setup Ruby uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7 with: - ruby-version: '2.7' + ruby-version: "2.7" bundler-cache: true - name: Cache Pod dependencies @@ -296,13 +296,13 @@ jobs: uses: actions/checkout@v3 - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Setup Cloudflare CLI run: pip3 install cloudflare - name: Configure AWS Credentials - uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main + uses: margelo/expensify-app-fork/.github/actions/composite/configureAwsCredentials@main with: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -352,7 +352,7 @@ jobs: needs: [android, desktop, iOS, web] steps: - name: Post Slack message on failure - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main + uses: margelo/expensify-app-fork/.github/actions/composite/announceFailedWorkflowInSlack@main with: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} @@ -368,7 +368,7 @@ jobs: - name: Set version run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV" - - name: 'Announces the deploy in the #announce Slack room' + - name: "Announces the deploy in the #announce Slack room" uses: 8398a7/action-slack@v3 with: status: custom @@ -384,7 +384,7 @@ jobs: GITHUB_TOKEN: ${{ github.token }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - - name: 'Announces the deploy in the #deployer Slack room' + - name: "Announces the deploy in the #deployer Slack room" uses: 8398a7/action-slack@v3 with: status: custom @@ -400,7 +400,7 @@ jobs: GITHUB_TOKEN: ${{ github.token }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - - name: 'Announces a production deploy in the #expensify-open-source Slack room' + - name: "Announces a production deploy in the #expensify-open-source Slack room" uses: 8398a7/action-slack@v3 if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} with: @@ -427,21 +427,21 @@ jobs: uses: actions/checkout@v3 - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Set version run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV" - name: Get Release Pull Request List id: getReleasePRList - uses: Expensify/App/.github/actions/javascript/getDeployPullRequestList@main + uses: margelo/expensify-app-fork/.github/actions/javascript/getDeployPullRequestList@main with: TAG: ${{ env.VERSION }} GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} IS_PRODUCTION_DEPLOY: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} - name: Comment on issues - uses: Expensify/App/.github/actions/javascript/markPullRequestsAsDeployed@main + uses: margelo/expensify-app-fork/.github/actions/javascript/markPullRequestsAsDeployed@main with: PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }} IS_PRODUCTION_DEPLOY: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml index d7d372aa7948..0bb0215ac8d6 100644 --- a/.github/workflows/preDeploy.yml +++ b/.github/workflows/preDeploy.yml @@ -7,13 +7,13 @@ on: jobs: typecheck: - uses: Expensify/App/.github/workflows/typecheck.yml@main + uses: margelo/expensify-app-fork/.github/workflows/typecheck.yml@main lint: - uses: Expensify/App/.github/workflows/lint.yml@main + uses: margelo/expensify-app-fork/.github/workflows/lint.yml@main test: - uses: Expensify/App/.github/workflows/test.yml@main + uses: margelo/expensify-app-fork/.github/workflows/test.yml@main confirmPassingBuild: runs-on: ubuntu-latest @@ -23,7 +23,7 @@ jobs: steps: - name: Announce failed workflow in Slack if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }} - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main + uses: margelo/expensify-app-fork/.github/actions/composite/announceFailedWorkflowInSlack@main with: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} @@ -47,7 +47,7 @@ jobs: - name: Check if StagingDeployCash is locked id: isStagingDeployLocked - uses: Expensify/App/.github/actions/javascript/isStagingDeployLocked@main + uses: margelo/expensify-app-fork/.github/actions/javascript/isStagingDeployLocked@main with: GITHUB_TOKEN: ${{ github.token }} @@ -71,7 +71,7 @@ jobs: createNewVersion: needs: chooseDeployActions if: ${{ fromJSON(needs.chooseDeployActions.outputs.SHOULD_DEPLOY) }} - uses: Expensify/App/.github/workflows/createNewVersion.yml@main + uses: margelo/expensify-app-fork/.github/workflows/createNewVersion.yml@main secrets: inherit updateStaging: @@ -92,7 +92,7 @@ jobs: token: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Setup Git for OSBotify - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab + uses: margelo/expensify-app-fork/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }} @@ -108,7 +108,7 @@ jobs: - name: Announce failed workflow in Slack if: ${{ failure() }} - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main + uses: margelo/expensify-app-fork/.github/actions/composite/announceFailedWorkflowInSlack@main with: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} @@ -180,7 +180,7 @@ jobs: e2ePerformanceTests: needs: [chooseDeployActions] if: ${{ needs.chooseDeployActions.outputs.SHOULD_DEPLOY }} - uses: Expensify/App/.github/workflows/e2ePerformanceTests.yml@main + uses: margelo/expensify-app-fork/.github/workflows/e2ePerformanceTests.yml@main secrets: inherit with: PR_NUMBER: ${{ needs.chooseDeployActions.outputs.MERGED_PR }} diff --git a/.github/workflows/reassurePerformanceTests.yml b/.github/workflows/reassurePerformanceTests.yml index ab5e1d06e5a4..c065ed28f715 100644 --- a/.github/workflows/reassurePerformanceTests.yml +++ b/.github/workflows/reassurePerformanceTests.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v3 - name: Setup NodeJS - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Run performance testing script shell: bash @@ -37,9 +37,8 @@ jobs: - name: Validate output.json id: validateReassureOutput - uses: Expensify/App/.github/actions/javascript/validateReassureOutput@main + uses: margelo/expensify-app-fork/.github/actions/javascript/validateReassureOutput@main with: DURATION_DEVIATION_PERCENTAGE: 20 COUNT_DEVIATION: 0 REGRESSION_OUTPUT: ${{ steps.reassure.outputs.content }} - diff --git a/.github/workflows/reviewerChecklist.yml b/.github/workflows/reviewerChecklist.yml index 413fc88ff403..59190900bc43 100644 --- a/.github/workflows/reviewerChecklist.yml +++ b/.github/workflows/reviewerChecklist.yml @@ -10,6 +10,6 @@ jobs: if: github.actor != 'OSBotify' steps: - name: reviewerChecklist.js - uses: Expensify/App/.github/actions/javascript/reviewerChecklist@main + uses: margelo/expensify-app-fork/.github/actions/javascript/reviewerChecklist@main with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 72bdd0468fd2..183199a967cc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,14 +15,14 @@ jobs: strategy: fail-fast: false matrix: - chunk: [ 1, 2, 3 ] + chunk: [1, 2, 3] name: test (job ${{ fromJSON(matrix.chunk) }}) steps: - name: Checkout uses: actions/checkout@v3 - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Get number of CPU cores id: cpu-cores @@ -45,7 +45,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: Expensify/App/.github/actions/composite/setupNode@main + - uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Storybook run run: npm run storybook -- --smoke-test --ci @@ -59,7 +59,7 @@ jobs: uses: actions/checkout@v3 - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Test CI git logic run: tests/unit/CIGitLogicTest.sh diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index 6ded44d7059f..4323781e92f3 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -8,7 +8,7 @@ on: required: true pull_request_target: types: [opened, synchronize, labeled] - branches: ['*ci-test/**'] + branches: ["*ci-test/**"] env: DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer @@ -83,12 +83,12 @@ jobs: echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Setup Ruby uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7 with: - ruby-version: '2.7' + ruby-version: "2.7" bundler-cache: true - name: Decrypt keystore @@ -102,7 +102,7 @@ jobs: LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} - name: Configure AWS Credentials - uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main + uses: margelo/expensify-app-fork/.github/actions/composite/configureAwsCredentials@main with: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -151,7 +151,7 @@ jobs: echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Setup XCode run: sudo xcode-select -switch /Applications/Xcode_14.2.app @@ -159,7 +159,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7 with: - ruby-version: '2.7' + ruby-version: "2.7" bundler-cache: true - name: Cache Pod dependencies @@ -193,7 +193,7 @@ jobs: LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} - name: Configure AWS Credentials - uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main + uses: margelo/expensify-app-fork/.github/actions/composite/configureAwsCredentials@main with: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -232,7 +232,7 @@ jobs: echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Decrypt Developer ID Certificate run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg @@ -240,7 +240,7 @@ jobs: DEVELOPER_ID_SECRET_PASSPHRASE: ${{ secrets.DEVELOPER_ID_SECRET_PASSPHRASE }} - name: Configure AWS Credentials - uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main + uses: margelo/expensify-app-fork/.github/actions/composite/configureAwsCredentials@main with: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -275,10 +275,10 @@ jobs: echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Configure AWS Credentials - uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main + uses: margelo/expensify-app-fork/.github/actions/composite/configureAwsCredentials@main with: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -339,13 +339,13 @@ jobs: if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }} with: token: ${{ secrets.OS_BOTIFY_TOKEN }} - body-include: 'Use the links below to test this build in android and iOS. Happy testing!' + body-include: "Use the links below to test this build in android and iOS. Happy testing!" number: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }} delete: true - name: Publish links to apps for download if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }} - uses: Expensify/App/.github/actions/javascript/postTestBuildComment@main + uses: margelo/expensify-app-fork/.github/actions/javascript/postTestBuildComment@main with: PR_NUMBER: ${{ env.PULL_REQUEST_NUMBER }} GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index de433b2ae88a..3e7461264c28 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: Expensify/App/.github/actions/composite/setupNode@main + - uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Type check with TypeScript run: npm run typecheck diff --git a/.github/workflows/validateDocsRoutes.yml b/.github/workflows/validateDocsRoutes.yml index 717560e19f5f..ca5d4c07ceba 100644 --- a/.github/workflows/validateDocsRoutes.yml +++ b/.github/workflows/validateDocsRoutes.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: Expensify/App/.github/actions/composite/setupNode@main + - uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main # Verify that no new hubs were created without adding their metadata to _routes.yml - name: Validate Docs Routes File diff --git a/.github/workflows/validateGithubActions.yml b/.github/workflows/validateGithubActions.yml index bcda941e1b05..093f9efa2868 100644 --- a/.github/workflows/validateGithubActions.yml +++ b/.github/workflows/validateGithubActions.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main # Rebuild all the actions on this branch and check for a diff. Fail if there is one, # because that would be a sign that the PR author did not rebuild the Github Actions diff --git a/.github/workflows/verifyPodfile.yml b/.github/workflows/verifyPodfile.yml index d8d931e476d1..765e967ac198 100644 --- a/.github/workflows/verifyPodfile.yml +++ b/.github/workflows/verifyPodfile.yml @@ -17,6 +17,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Setup Node - uses: Expensify/App/.github/actions/composite/setupNode@main + uses: margelo/expensify-app-fork/.github/actions/composite/setupNode@main - name: Verify podfile run: ./.github/scripts/verifyPodfile.sh diff --git a/.github/workflows/verifySignedCommits.yml b/.github/workflows/verifySignedCommits.yml index ee1b0c4c78da..ce366e4320ae 100644 --- a/.github/workflows/verifySignedCommits.yml +++ b/.github/workflows/verifySignedCommits.yml @@ -10,6 +10,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Verify signed commits - uses: Expensify/App/.github/actions/javascript/verifySignedCommits@main + uses: margelo/expensify-app-fork/.github/actions/javascript/verifySignedCommits@main with: GITHUB_TOKEN: ${{ github.token }} diff --git a/app-e2eRelease-baseline.apk b/app-e2eRelease-baseline.apk new file mode 100644 index 000000000000..907cd84923bc --- /dev/null +++ b/app-e2eRelease-baseline.apk @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ade53e3e5271707677ce3f647d4ed0b37ab98621ba989acf3f56e7842a295bda +size 128355102 diff --git a/app-e2eRelease-compare.apk b/app-e2eRelease-compare.apk new file mode 100644 index 000000000000..907cd84923bc --- /dev/null +++ b/app-e2eRelease-compare.apk @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ade53e3e5271707677ce3f647d4ed0b37ab98621ba989acf3f56e7842a295bda +size 128355102