From 72c95b1e97c1fa4922ea039bbb7e284b1d54bf0e Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Fri, 2 Jun 2023 17:53:33 -0400 Subject: [PATCH 1/2] Merge pull request #20101 from Expensify/version-BUILD-EAB84E08-D27A-4137-AEDB-ECA18FDFEB61 Update version to 1.3.23-5 on main (cherry picked from commit 9bd355704c90d9c7099de0cf5285136ec8dc652d) --- 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 de24b55d8401..ba3c1258e2a1 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 1001032304 - versionName "1.3.23-4" + versionCode 1001032305 + versionName "1.3.23-5" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index c3a9873fa241..e48fdb592b9c 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.3.23.4 + 1.3.23.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 6c54b9485325..f2a7a0a1b683 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.23.4 + 1.3.23.5 diff --git a/package-lock.json b/package-lock.json index 92607afed7bc..170448f9da6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.23-4", + "version": "1.3.23-5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.23-4", + "version": "1.3.23-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 7776f5eb4c78..09e2ef983f9d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.23-4", + "version": "1.3.23-5", "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 1509c7d32bbcacd74ecd5a7cbd50b855cea8ab26 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Fri, 2 Jun 2023 14:45:15 -0700 Subject: [PATCH 2/2] Merge pull request #20096 from Expensify/andrew-large-runner-label Try to use `labels:` to get large runner to start (cherry picked from commit e36ec379d886608c0be58ab13b1567a356f4aee2) --- .github/scripts/validateActionsAndWorkflows.sh | 2 +- .github/workflows/platformDeploy.yml | 6 ++++-- .github/workflows/testBuild.yml | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/scripts/validateActionsAndWorkflows.sh b/.github/scripts/validateActionsAndWorkflows.sh index 83fa126a384c..36bd9cc10879 100755 --- a/.github/scripts/validateActionsAndWorkflows.sh +++ b/.github/scripts/validateActionsAndWorkflows.sh @@ -86,7 +86,7 @@ else fi info 'Linting workflows...' -./actionlint -color || EXIT_CODE=1 +./actionlint -color -ignore '"runs-on" section must be sequence node but got mapping node with "!!map" tag' || EXIT_CODE=1 if [[ "$EXIT_CODE" == 0 ]]; then success 'Workflows passed actionlint!' fi diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 09fc10b5eab8..d85a2bd1363f 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -29,7 +29,8 @@ jobs: name: Build and deploy Android needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }} - runs-on: ubuntu-latest-16-cores + runs-on: + labels: ubuntu-latest-16-cores steps: # This action checks-out the repository, so the workflow can access it. - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -239,7 +240,8 @@ jobs: name: Build and deploy Web needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }} - runs-on: ubuntu-latest-16-cores + runs-on: + labels: ubuntu-latest-16-cores 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 affd8619de3b..ad77df21cdb3 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -62,7 +62,8 @@ jobs: name: Build and deploy Android for testing needs: [validateActor, getBranchRef] if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }} - runs-on: ubuntu-latest-16-cores + runs-on: + labels: ubuntu-latest-16-cores env: PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }} steps: @@ -232,7 +233,8 @@ 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-16-cores + runs-on: + labels: ubuntu-latest-16-cores steps: - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: