Merge branch 'main' into scanningRegression

Merge main to fix branch
Expensify · Jun 28, 2024 · 26b2792 · 26b2792
2 parents fb0ca88 + e78c38e
commit 26b2792
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 48 deletions.
diff --git a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
@@ -21,7 +21,27 @@ async function run() {
                 status: 'completed',
                 event: isProductionDeploy ? 'release' : 'push',
             })
-        ).data.workflow_runs;
+        ).data.workflow_runs
+            // Note: we filter out cancelled runs instead of looking only for success runs
+            // because if a build fails on even one platform, then it will have the status 'failure'
+            .filter((workflowRun) => workflowRun.conclusion !== 'cancelled');
+
+        // Find the most recent deploy workflow for which at least one of the build jobs finished successfully.
+        let lastSuccessfulDeploy = completedDeploys.shift();
+        while (
+            lastSuccessfulDeploy &&
+            !(
+                await GithubUtils.octokit.actions.listJobsForWorkflowRun({
+                    owner: github.context.repo.owner,
+                    repo: github.context.repo.repo,
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    run_id: lastSuccessfulDeploy.id,
+                    filter: 'latest',
+                })
+            ).data.jobs.some((job) => job.name.startsWith('Build and deploy') && job.conclusion === 'success')
+        ) {
+            lastSuccessfulDeploy = completedDeploys.shift();
+        }
 
         const priorTag = completedDeploys[0].head_branch;
         console.log(`Looking for PRs deployed to ${deployEnv} between ${priorTag} and ${inputTag}`);

diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -11515,7 +11515,22 @@ async function run() {
             workflow_id: 'platformDeploy.yml',
             status: 'completed',
             event: isProductionDeploy ? 'release' : 'push',
-        })).data.workflow_runs;
+        })).data.workflow_runs
+            // Note: we filter out cancelled runs instead of looking only for success runs
+            // because if a build fails on even one platform, then it will have the status 'failure'
+            .filter((workflowRun) => workflowRun.conclusion !== 'cancelled');
+        // Find the most recent deploy workflow for which at least one of the build jobs finished successfully.
+        let lastSuccessfulDeploy = completedDeploys.shift();
+        while (lastSuccessfulDeploy &&
+            !(await GithubUtils_1.default.octokit.actions.listJobsForWorkflowRun({
+                owner: github.context.repo.owner,
+                repo: github.context.repo.repo,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                run_id: lastSuccessfulDeploy.id,
+                filter: 'latest',
+            })).data.jobs.some((job) => job.name.startsWith('Build and deploy') && job.conclusion === 'success')) {
+            lastSuccessfulDeploy = completedDeploys.shift();
+        }
         const priorTag = completedDeploys[0].head_branch;
         console.log(`Looking for PRs deployed to ${deployEnv} between ${priorTag} and ${inputTag}`);
         const prList = await GitUtils_1.default.getPullRequestsMergedBetween(priorTag ?? '', inputTag);

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,8 +10,8 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -20,17 +20,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.944.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.948.0)
+    aws-sdk-core (3.199.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.85.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.87.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.3)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-s3 (1.154.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -119,7 +119,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.221.0)
+    fastlane (2.221.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009000301
-        versionName "9.0.3-1"
+        versionCode 1009000302
+        versionName "9.0.3-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -239,35 +239,27 @@ platform :ios do
         }
     )
 
-    begin
-      upload_to_testflight(
-          api_key_path: "./ios/ios-fastlane-json-key.json",
-          distribute_external: true,
-          notify_external_testers: true,
-          changelog: "Thank you for beta testing New Expensify, this version includes bug fixes and improvements.",
-          groups: ["Beta"],
-          demo_account_required: true,
-          beta_app_review_info: {
-              contact_email: ENV["APPLE_CONTACT_EMAIL"],
-              contact_first_name: "Andrew",
-              contact_last_name: "Gable",
-              contact_phone: ENV["APPLE_CONTACT_PHONE"],
-              demo_account_name: ENV["APPLE_DEMO_EMAIL"],
-              demo_account_password: ENV["APPLE_DEMO_PASSWORD"],
-              notes: "1. In the Expensify app, enter the email '[email protected]'. This will trigger a sign-in link to be sent to '[email protected]'
-                      2. Navigate to https://account.proton.me/login, log into Proton Mail using '[email protected]' as email and the password associated with '[email protected]', provided above
-                      3. Once logged into Proton Mail, navigate to your inbox and locate the email triggered in step 1. The email subject should be 'Your magic sign-in link for Expensify'
-                      4. Open the email and copy the 6-digit sign-in code provided within
-                      5. Return to the Expensify app and enter the copied 6-digit code in the designated login field"
-          }
-      )
-    rescue Exception => e
-      if e.message.include? "Another build is in review"
-        UI.important("Another build is already in external beta review. Skipping external beta review submission")
-      else
-        raise
-      end
-    end
+    upload_to_testflight(
+      api_key_path: "./ios/ios-fastlane-json-key.json",
+      distribute_external: true,
+      notify_external_testers: true,
+      changelog: "Thank you for beta testing New Expensify, this version includes bug fixes and improvements.",
+      groups: ["Beta"],
+      demo_account_required: true,
+      beta_app_review_info: {
+          contact_email: ENV["APPLE_CONTACT_EMAIL"],
+          contact_first_name: "Andrew",
+          contact_last_name: "Gable",
+          contact_phone: ENV["APPLE_CONTACT_PHONE"],
+          demo_account_name: ENV["APPLE_DEMO_EMAIL"],
+          demo_account_password: ENV["APPLE_DEMO_PASSWORD"],
+          notes: "1. In the Expensify app, enter the email '[email protected]'. This will trigger a sign-in link to be sent to '[email protected]'
+                  2. Navigate to https://account.proton.me/login, log into Proton Mail using '[email protected]' as email and the password associated with '[email protected]', provided above
+                  3. Once logged into Proton Mail, navigate to your inbox and locate the email triggered in step 1. The email subject should be 'Your magic sign-in link for Expensify'
+                  4. Open the email and copy the 6-digit sign-in code provided within
+                  5. Return to the Expensify app and enter the copied 6-digit code in the designated login field"
+      }
+    )
 
     upload_symbols_to_crashlytics(
       app_id: "1:921154746561:ios:216bd10ccc947659027c40",

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.3.1</string>
+	<string>9.0.3.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</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>9.0.3.1</string>
+	<string>9.0.3.2</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.3</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.3.1</string>
+	<string>9.0.3.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

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": "9.0.3-1",
+  "version": "9.0.3-2",
   "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.",