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

…-20104 🍒 Cherry pick PR #20104 to staging 🍒
Expensify · Jun 2, 2023 · 609634d · 609634d
2 parents 2bb39de + f8aa329
commit 609634d
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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:

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 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
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.23.5</string>
+	<string>1.3.23.6</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.23.5</string>
+	<string>1.3.23.6</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.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.",