Merge branch 'main' into nat-refacvbba

Expensify · Apr 10, 2024 · 9981000 · 9981000
2 parents d206851 + 04d85f7
commit 9981000
Show file tree

Hide file tree

Showing 635 changed files with 36,967 additions and 43,529 deletions.
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
@@ -2,6 +2,6 @@
 self-hosted-runner:
   labels:
     - ubuntu-latest-xl
-    - macos-12-xl
+    - macos-13-large
     - macos-13-xlarge
     - ubuntu-latest-reassure-tests
diff --git a/.github/actions/javascript/authorChecklist/categories/newComponentCategory.ts b/.github/actions/javascript/authorChecklist/categories/newComponentCategory.ts
@@ -1,4 +1,4 @@
-import github from '@actions/github';
+import * as github from '@actions/github';
 import {parse} from '@babel/parser';
 import traverse from '@babel/traverse';
 import CONST from '@github/libs/CONST';

diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
diff --git a/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts b/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts
@@ -1,19 +1,19 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import lodashThrottle from 'lodash/throttle';
-import ActionUtils from '@github/libs/ActionUtils';
+import {getStringInput} from '@github/libs/ActionUtils';
 import CONST from '@github/libs/CONST';
-import GitHubUtils, {POLL_RATE} from '@github/libs/GithubUtils';
+import GitHubUtils from '@github/libs/GithubUtils';
 import {promiseDoWhile} from '@github/libs/promiseWhile';
 
 type CurrentStagingDeploys = Awaited<ReturnType<typeof GitHubUtils.octokit.actions.listWorkflowRuns>>['data']['workflow_runs'];
 
 function run() {
     console.info('[awaitStagingDeploys] run()');
-    console.info('[awaitStagingDeploys] ActionUtils', ActionUtils);
+    console.info('[awaitStagingDeploys] getStringInput', getStringInput);
     console.info('[awaitStagingDeploys] GitHubUtils', GitHubUtils);
     console.info('[awaitStagingDeploys] promiseDoWhile', promiseDoWhile);
 
-    const tag = ActionUtils.getStringInput('TAG', {required: false});
+    const tag = getStringInput('TAG', {required: false});
     console.info('[awaitStagingDeploys] run() tag', tag);
 
     let currentStagingDeploys: CurrentStagingDeploys = [];
@@ -41,20 +41,23 @@ function run() {
                 }),
         ])
             .then((responses) => {
+                console.info('[awaitStagingDeploys] listWorkflowRuns responses', responses);
                 const workflowRuns = responses[0].data.workflow_runs;
                 if (!tag && typeof responses[1] === 'object') {
                     workflowRuns.push(...responses[1].data.workflow_runs);
                 }
+                console.info('[awaitStagingDeploys] workflowRuns', workflowRuns);
                 return workflowRuns;
             })
             .then((workflowRuns) => (currentStagingDeploys = workflowRuns.filter((workflowRun) => workflowRun.status !== 'completed')))
-            .then(() =>
+            .then(() => {
+                console.info('[awaitStagingDeploys] currentStagingDeploys', currentStagingDeploys);
                 console.log(
                     !currentStagingDeploys.length
                         ? 'No current staging deploys found'
                         : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`,
-                ),
-            );
+                );
+            });
     console.info('[awaitStagingDeploys] run() throttleFunc', throttleFunc);
 
     return promiseDoWhile(
@@ -63,7 +66,7 @@ function run() {
             throttleFunc,
 
             // Poll every 60 seconds instead of every 10 seconds
-            POLL_RATE * 6,
+            CONST.POLL_RATE * 6,
         ),
     );
 }