Merge branch 'main' into feature/40998-improve-task-replies

.eslintrc.js

@@ -122,6 +122,7 @@ module.exports = {
                         },
                     },
                 ],
+                'rulesdir/avoid-anonymous-functions': 'off',
             },
         },
         // This helps disable the `prefer-alias` rule to be enabled for specific directories
@@ -276,5 +277,11 @@ module.exports = {
                 'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
             },
         },
+        {
+            files: ['en.ts', 'es.ts'],
+            rules: {
+                'rulesdir/use-periods-for-error-messages': 'error',
+            },
+        },
     ],
 };

.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts

@@ -8,6 +8,7 @@ import {promiseDoWhile} from '@github/libs/promiseWhile';
 type CurrentStagingDeploys = Awaited<ReturnType<typeof GitHubUtils.octokit.actions.listWorkflowRuns>>['data']['workflow_runs'];
 
 function run() {
+    console.info('[awaitStagingDeploys] POLL RATE', CONST.POLL_RATE);
     console.info('[awaitStagingDeploys] run()');
     console.info('[awaitStagingDeploys] getStringInput', getStringInput);
     console.info('[awaitStagingDeploys] GitHubUtils', GitHubUtils);

.github/actions/javascript/awaitStagingDeploys/index.js

@@ -12131,6 +12131,7 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
 const promiseWhile_1 = __nccwpck_require__(9438);
 function run() {
+    console.info('[awaitStagingDeploys] POLL RATE', CONST_1.default.POLL_RATE);
     console.info('[awaitStagingDeploys] run()');
     console.info('[awaitStagingDeploys] getStringInput', ActionUtils_1.getStringInput);
     console.info('[awaitStagingDeploys] GitHubUtils', GithubUtils_1.default);
@@ -12742,7 +12743,12 @@ function promiseWhile(condition, action) {
                     resolve();
                     return;
                 }
-                Promise.resolve(actionResult).then(loop).catch(reject);
+                Promise.resolve(actionResult)
+                    .then(() => {
+                    // Set a timeout to delay the next loop iteration
+                    setTimeout(loop, 1000); // 1000 ms delay
+                })
+                    .catch(reject);
             }
         };
         loop();

.github/libs/promiseWhile.ts

@@ -19,7 +19,12 @@ function promiseWhile(condition: () => boolean, action: (() => Promise<void>) |
                     return;
                 }
 
-                Promise.resolve(actionResult).then(loop).catch(reject);
+                Promise.resolve(actionResult)
+                    .then(() => {
+                        // Set a timeout to delay the next loop iteration
+                        setTimeout(loop, 1000); // 1000 ms delay
+                    })
+                    .catch(reject);
             }
         };
         loop();

.github/workflows/failureNotifier.yml

@@ -27,19 +27,49 @@ jobs:
             });
             return jobsData.data;
 
+      - name: Fetch Previous Workflow Run
+        id: previous-workflow-run
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const runId = ${{ github.event.workflow_run.id }};
+            const allRuns = await github.rest.actions.listWorkflowRuns({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'preDeploy.yml',
+            });
+            const filteredRuns = allRuns.data.workflow_runs.filter(run => run.actor.login !== 'OSBotify' && run.status !== 'cancelled');
+            const currentIndex = filteredRuns.findIndex(run => run.id === runId);
+            const previousRun = filteredRuns[currentIndex + 1];
+            return previousRun;
+
+      - name: Fetch Previous Workflow Run Jobs
+        id: previous-workflow-jobs
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const previousRun = ${{ steps.previous-workflow-run.outputs.result }};
+            const runId = previousRun.id;
+            const jobsData = await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: runId,
+            });
+            return jobsData.data;
+
       - name: Process Each Failed Job
         uses: actions/github-script@v7
         with:
           script: |
             const jobs = ${{ steps.fetch-workflow-jobs.outputs.result }};
-
+            const previousRun = ${{ steps.previous-workflow-run.outputs.result }};
+            const previousRunJobs = ${{ steps.previous-workflow-jobs.outputs.result }};
             const headCommit = "${{ github.event.workflow_run.head_commit.id }}";            
             const prData = await github.rest.repos.listPullRequestsAssociatedWithCommit({
               owner: context.repo.owner,
               repo: context.repo.repo,
               commit_sha: headCommit,
             });
-
             const pr = prData.data[0];
             const prLink = pr.html_url;
             const prAuthor = pr.user.login;
@@ -50,14 +80,8 @@ jobs:
               if (jobs.jobs[i].conclusion == 'failure') {
                 const jobName = jobs.jobs[i].name;
                 const jobLink = jobs.jobs[i].html_url;
-                const issues = await github.rest.issues.listForRepo({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  labels: failureLabel,
-                  state: 'open'
-                });
-                const existingIssue = issues.data.find(issue => issue.title.includes(jobName));
-                if (!existingIssue) {
+                const previousJob = previousRunJobs.jobs.find(job => job.name === jobName);
+                if (previousJob?.conclusion === 'success') {
                   const annotations = await github.rest.checks.listAnnotations({
                     owner: context.repo.owner,
                     repo: context.repo.repo,

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001046602
-        versionName "1.4.66-2"
+        versionCode 1001046803
+        versionName "1.4.68-3"
         // 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"

config/webpack/webpack.dev.ts

@@ -21,16 +21,12 @@ const getConfiguration = (environment: Environment): Promise<Configuration> =>
             process.env.USE_WEB_PROXY === 'false'
                 ? {}
                 : {
-                      proxy: {
-                          // eslint-disable-next-line @typescript-eslint/naming-convention
-                          '/api': 'http://[::1]:9000',
-                          // eslint-disable-next-line @typescript-eslint/naming-convention
-                          '/staging': 'http://[::1]:9000',
-                          // eslint-disable-next-line @typescript-eslint/naming-convention
-                          '/chat-attachments': 'http://[::1]:9000',
-                          // eslint-disable-next-line @typescript-eslint/naming-convention
-                          '/receipts': 'http://[::1]:9000',
-                      },
+                      proxy: [
+                          {
+                              context: ['/api', '/staging', '/chat-attachments', '/receipts'],
+                              target: 'http://[::1]:9000',
+                          },
+                      ],
                   };
 
         const baseConfig = getCommonConfiguration(environment);