From 86558b0e7ab25e16880dab8b91928cdcf2bce8be Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Fri, 2 Jun 2023 18:50:03 -0400 Subject: [PATCH 1/2] Merge pull request #20108 from Expensify/version-BUILD-6EFE4B0D-CC2A-46E3-9334-B0DF456C2847 Update version to 1.3.23-6 on main (cherry picked from commit f50b0dedcdba30bdb015351ca0a8527eb6529689) --- 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 ba3c1258e2a1..8408cd358e73 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 1001032305 - versionName "1.3.23-5" + versionCode 1001032306 + versionName "1.3.23-6" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index e48fdb592b9c..a99fe37c2bb8 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.3.23.5 + 1.3.23.6 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index f2a7a0a1b683..320c219b90c4 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.23.5 + 1.3.23.6 diff --git a/package-lock.json b/package-lock.json index 170448f9da6e..a461d5be0131 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.23-5", + "version": "1.3.23-6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.23-5", + "version": "1.3.23-6", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 09e2ef983f9d..b6b41a720559 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.23-5", + "version": "1.3.23-6", "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 f8aa3290ae05cefa9c6b379694b98ce16e2f8a9d Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Fri, 2 Jun 2023 15:42:10 -0700 Subject: [PATCH 2/2] Merge pull request #20104 from Expensify/andrew-revert (cherry picked from commit aade7149a0269a612d2707454db4ffd255b62ffe) --- .github/actionlint.yaml | 1 - .github/scripts/validateActionsAndWorkflows.sh | 2 +- .github/workflows/platformDeploy.yml | 6 ++---- .github/workflows/testBuild.yml | 6 ++---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index b41600837e53..d2a8b4a0b9b5 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -2,5 +2,4 @@ self-hosted-runner: labels: - ubuntu-20.04-64core - - ubuntu-latest-16-cores - macos-12-xl diff --git a/.github/scripts/validateActionsAndWorkflows.sh b/.github/scripts/validateActionsAndWorkflows.sh index 36bd9cc10879..83fa126a384c 100755 --- a/.github/scripts/validateActionsAndWorkflows.sh +++ b/.github/scripts/validateActionsAndWorkflows.sh @@ -86,7 +86,7 @@ else fi info 'Linting workflows...' -./actionlint -color -ignore '"runs-on" section must be sequence node but got mapping node with "!!map" tag' || EXIT_CODE=1 +./actionlint -color || 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 d85a2bd1363f..b603a06ea74e 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -29,8 +29,7 @@ jobs: name: Build and deploy Android needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }} - runs-on: - labels: ubuntu-latest-16-cores + runs-on: ubuntu-latest steps: # This action checks-out the repository, so the workflow can access it. - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -240,8 +239,7 @@ jobs: name: Build and deploy Web needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }} - runs-on: - labels: ubuntu-latest-16-cores + runs-on: ubuntu-latest 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 ad77df21cdb3..ee28a5a52d09 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -62,8 +62,7 @@ jobs: name: Build and deploy Android for testing needs: [validateActor, getBranchRef] if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }} - runs-on: - labels: ubuntu-latest-16-cores + runs-on: ubuntu-latest env: PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }} steps: @@ -233,8 +232,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: - labels: ubuntu-latest-16-cores + runs-on: ubuntu-latest steps: - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: