diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml index 60d6a969b256..e88d06886778 100644 --- a/.github/workflows/cherryPick.yml +++ b/.github/workflows/cherryPick.yml @@ -150,19 +150,12 @@ jobs: pr_body: '🍒 Cherry pick https://github.com/Expensify/App/pull/${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 🍒' pr_label: automerge - - name: Check if pull request is mergeable - id: isPullRequestMergeable - uses: Expensify/App/.github/actions/isPullRequestMergeable@main - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PULL_REQUEST_NUMBER: ${{ steps.createPullRequest.outputs.pr_number }} - - name: Check if ShortVersionString is up to date id: isShortVersionStringUpdated uses: Expensify/App/.github/actions/checkBundleVersionStringMatch@main - name: Auto-assign PR if there are merge conflicts or if the bundle versions are mismatched - if: ${{ !fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) || !fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) || !fromJSON(steps.isShortVersionStringUpdated.outputs.BUNDLE_VERSIONS_MATCH) }} + if: ${{ !fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) || !fromJSON(steps.isShortVersionStringUpdated.outputs.BUNDLE_VERSIONS_MATCH) }} uses: actions-ecosystem/action-add-labels@a8ae047fee0ca28235f9764e1c478d2136dc15c1 with: number: ${{ steps.createPullRequest.outputs.pr_number }} @@ -171,7 +164,7 @@ jobs: Hourly - name: Assign the PR to the deployer - if: ${{ !fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) || !fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) }} + if: ${{ !fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) }} uses: actions-ecosystem/action-add-assignees@a73fcabd82d847c5e7433fcfdd58ef9f7e8a3993 with: number: ${{ steps.createPullRequest.outputs.pr_number }} @@ -179,7 +172,7 @@ jobs: assignees: ${{ steps.getCPMergeCommit.outputs.MERGE_ACTOR }} - name: If PR has merge conflicts, comment with instructions for assignee - if: ${{ !fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) || !fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) }} + if: ${{ !fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) }} uses: actions-ecosystem/action-create-comment@cd098164398331c50e7dfdd0dfa1b564a1873fac with: github_token: ${{ secrets.OS_BOTIFY_TOKEN }} @@ -202,13 +195,20 @@ jobs: - name: Check for an auto approve # Important: only auto-approve if there was no merge conflict! - if: ${{ fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) && fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) }} + if: ${{ fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) }} # Version: 2.0.0 uses: hmarr/auto-approve-action@6a9ec7556f0a7fa5b49527a1eea4878b8a22d2e0 with: github-token: ${{ secrets.GITHUB_TOKEN }} pull-request-number: ${{ steps.createPullRequest.outputs.pr_number }} + - name: Check if pull request is mergeable + id: isPullRequestMergeable + uses: Expensify/App/.github/actions/isPullRequestMergeable@main + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULL_REQUEST_NUMBER: ${{ steps.createPullRequest.outputs.pr_number }} + - name: Check for an auto merge # Important: only auto-merge if there was no merge conflict! if: ${{ fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) && fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) }} diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml index cc7aa5b85850..36fc308c6bc4 100644 --- a/.github/workflows/updateProtectedBranch.yml +++ b/.github/workflows/updateProtectedBranch.yml @@ -53,7 +53,7 @@ jobs: - name: Set New Version run: echo "NEW_VERSION=$(npm run print-version --silent)" >> $GITHUB_ENV - + - name: Decrypt Botify GPG key run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg env: @@ -91,27 +91,6 @@ jobs: pr_body: Update version to ${{ env.NEW_VERSION }} pr_label: automerge - - name: Check if pull request is mergeable - id: isPullRequestMergeable - uses: Expensify/App/.github/actions/isPullRequestMergeable@main - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PULL_REQUEST_NUMBER: ${{ steps.createPullRequest.outputs.pr_number }} - - - name: Leave comment if PR is not mergeable - if: ${{ !fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) }} - uses: actions-ecosystem/action-create-comment@cd098164398331c50e7dfdd0dfa1b564a1873fac - with: - github_token: ${{ secrets.OS_BOTIFY_TOKEN }} - number: ${{ steps.createPullRequest.outputs.pr_number }} - body: | - :bell: @Expensify/mobile-deployers :bell: - The Update Protected Branch workflow has failed because this PR was not mergable. - If you are the deployer this week, please resolve the error and merge this PR to continue the deploy process. - - - name: Fail workflow if PR is not mergeable - if: ${{ steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'false' }} - run: exit 1 - - name: Check changed files if: ${{ github.event.inputs.TARGET_BRANCH == 'main' }} id: changedFiles @@ -132,6 +111,27 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} pull-request-number: ${{ steps.createPullRequest.outputs.pr_number }} + - name: Check if pull request is mergeable + id: isPullRequestMergeable + uses: Expensify/App/.github/actions/isPullRequestMergeable@main + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULL_REQUEST_NUMBER: ${{ steps.createPullRequest.outputs.pr_number }} + + - name: Leave comment if PR is not mergeable + if: ${{ !fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) }} + uses: actions-ecosystem/action-create-comment@cd098164398331c50e7dfdd0dfa1b564a1873fac + with: + github_token: ${{ secrets.OS_BOTIFY_TOKEN }} + number: ${{ steps.createPullRequest.outputs.pr_number }} + body: | + :bell: @Expensify/mobile-deployers :bell: - The Update Protected Branch workflow has failed because this PR was not mergable. + If you are the deployer this week, please resolve the error and merge this PR to continue the deploy process. + + - name: Fail workflow if PR is not mergeable + if: ${{ steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'false' }} + run: exit 1 + - name: Check for an auto merge # Version: 0.12.0 uses: pascalgn/automerge-action@39d831e1bb389bd242626bc25d4060064a97181c diff --git a/android/app/build.gradle b/android/app/build.gradle index 82f9b432fa05..ac8f79a6b53b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -149,8 +149,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001012500 - versionName "1.1.25-0" + versionCode 1001012501 + versionName "1.1.25-1" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 625d8687146a..ef11fd4f1d5e 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.25.0 + 1.1.25.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 1ee546130950..c7b1606f4e62 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.25.0 + 1.1.25.1 diff --git a/package-lock.json b/package-lock.json index a1c3e59d189d..f0d33915dd58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.25-0", + "version": "1.1.25-1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 469f1c937a8a..d4f79870e10e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.25-0", + "version": "1.1.25-1", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",