Merge pull request #21251 from Expensify/OSBotify-cherry-pick-staging…

…-21232 🍒 Cherry pick PR #21232 to staging 🍒
Expensify · Jun 21, 2023 · caf4ad2 · caf4ad2
2 parents 48f545a + 4f8f672
commit caf4ad2
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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:

diff --git 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
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.30.0</string>
+	<string>1.3.30.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.30.0</string>
+	<string>1.3.30.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git 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.",