From 169a68b651140fcb148786c759c9d68912b018a5 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Wed, 21 Jun 2023 15:16:07 -0400 Subject: [PATCH 1/2] Merge pull request #21250 from Expensify/version-BUILD-AC26DB45-2463-4C75-BDE9-C4E243F9AEBA Update version to 1.3.30-1 on main (cherry picked from commit 1e71ef26c27595f965549ed1db201738b77c2f56) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7125a88e1d70..9985272d6ffd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001033000 - versionName "1.3.30-0" + versionCode 1001033001 + versionName "1.3.30-1" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 59b0cebc265f..17cf290c306e 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.3.30.0 + 1.3.30.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 99593696afab..e304cffc9f45 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.30.0 + 1.3.30.1 diff --git a/package-lock.json b/package-lock.json index 327a78c3dbcb..08132b59dc98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.30-0", + "version": "1.3.30-1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.30-0", + "version": "1.3.30-1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 1868a6f75f83..3a6ed42511d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.30-0", + "version": "1.3.30-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.", From 4f8f67265caa31a72029a05198d520771181a4ab Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 21 Jun 2023 13:09:33 -0600 Subject: [PATCH 2/2] Merge pull request #21232 from Expensify/andrew-large-runners [No QA]Use `ubuntu-latest-xl` and `macos-12-xl` large runners to speed up deploys (cherry picked from commit a3b583ec6357650fc0bbb68a694a99ffe7e93652) --- .github/actionlint.yaml | 2 +- .github/scripts/validateActionsAndWorkflows.sh | 4 +++- .github/workflows/e2ePerformanceTests.yml | 6 +++--- .github/workflows/platformDeploy.yml | 6 +++--- .github/workflows/testBuild.yml | 6 +++--- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index d2a8b4a0b9b5..9a314079362c 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -1,5 +1,5 @@ # See https://github.com/rhysd/actionlint/blob/main/docs/config.md self-hosted-runner: labels: - - ubuntu-20.04-64core + - ubuntu-latest-xl - macos-12-xl diff --git a/.github/scripts/validateActionsAndWorkflows.sh b/.github/scripts/validateActionsAndWorkflows.sh index 8d186ea51a44..07348a302f20 100755 --- a/.github/scripts/validateActionsAndWorkflows.sh +++ b/.github/scripts/validateActionsAndWorkflows.sh @@ -43,7 +43,9 @@ for ((i=0; i < ${#WORKFLOWS[@]}; i++)); do WORKFLOW=${WORKFLOWS[$i]} # Skip linting e2e workflow due to bug here: https://github.com/SchemaStore/schemastore/issues/2579 - if [[ "$WORKFLOW" == './workflows/e2ePerformanceTests.yml' ]]; then + if [[ "$WORKFLOW" == './workflows/e2ePerformanceTests.yml' + || "$WORKFLOW" == './workflows/testBuild.yml' + || "$WORKFLOW" == './workflows/platformDeploy.yml' ]]; then continue fi diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml index d66a59bfbc27..851a578ffdd3 100644 --- a/.github/workflows/e2ePerformanceTests.yml +++ b/.github/workflows/e2ePerformanceTests.yml @@ -17,7 +17,7 @@ on: jobs: buildBaseline: - runs-on: ubuntu-20.04-64core + runs-on: ubuntu-latest-xl name: Build apk from latest release as a baseline outputs: VERSION: ${{ steps.getMostRecentRelease.outputs.VERSION }} @@ -53,7 +53,7 @@ jobs: ARTIFACT_NAME: baseline-apk-${{ steps.getMostRecentRelease.outputs.VERSION }} buildDelta: - runs-on: ubuntu-20.04-64core + runs-on: ubuntu-latest-xl name: Build apk from delta ref outputs: DELTA_REF: ${{ steps.getDeltaRef.outputs.DELTA_REF }} @@ -115,7 +115,7 @@ jobs: ARTIFACT_NAME: delta-apk-${{ steps.getDeltaRef.outputs.DELTA_REF }} runTestsInAWS: - runs-on: ubuntu-20.04-64core + runs-on: ubuntu-latest-xl needs: [buildBaseline, buildDelta] name: Run E2E tests in AWS device farm steps: diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 3884f88e4ff2..f7989092fb0d 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -29,7 +29,7 @@ jobs: name: Build and deploy Android needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }} - runs-on: ubuntu-latest + runs-on: ubuntu-latest-xl steps: # This action checks-out the repository, so the workflow can access it. - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -103,7 +103,7 @@ jobs: name: Build and deploy Desktop needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }} - runs-on: macos-12 + runs-on: macos-12-xl steps: # This action checks-out the repository, so the workflow can access it. - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -232,7 +232,7 @@ jobs: name: Build and deploy Web needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }} - runs-on: ubuntu-latest + runs-on: ubuntu-latest-xl steps: # This action checks-out the repository, so the workflow can access it. - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index cee2ad4c3b83..2b2db82c36b0 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -62,7 +62,7 @@ jobs: name: Build and deploy Android for testing needs: [validateActor, getBranchRef] if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }} - runs-on: ubuntu-latest + runs-on: ubuntu-latest-xl env: PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }} steps: @@ -182,7 +182,7 @@ jobs: if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }} env: PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }} - runs-on: macos-12 + runs-on: macos-12-xl steps: # This action checks-out the repository, so the workflow can access it. - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -225,7 +225,7 @@ jobs: if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }} env: PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }} - runs-on: ubuntu-latest + runs-on: ubuntu-latest-xl steps: - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: