Merge branch 'main' into fix/37287

.github/PULL_REQUEST_TEMPLATE.md

@@ -85,7 +85,7 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
     - [ ] I verified any copy / text shown in the product is localized by adding it to `src/languages/*` files and using the [translation method](https://github.com/Expensify/App/blob/4bd99402cebdf4d7394e0d1f260879ea238197eb/src/components/withLocalize.js#L60)
       - [ ] If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
     - [ ] I verified all numbers, amounts, dates and phone numbers shown in the product are using the [localization methods](https://github.com/Expensify/App/blob/4bd99402cebdf4d7394e0d1f260879ea238197eb/src/components/withLocalize.js#L60-L68)
-    - [ ] I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the `Waiting for Copy` label for a copy review on the original GH to get the correct copy.
+    - [ ] I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
     - [ ] I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
     - [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#jsdocs)) were followed
 - [ ] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers

.github/actionlint.yaml

@@ -4,3 +4,4 @@ self-hosted-runner:
     - ubuntu-latest-xl
     - macos-12-xl
     - macos-13-xlarge
+    - ubuntu-latest-reassure-tests

.github/actions/composite/setupNode/action.yml

@@ -18,13 +18,13 @@ runs:
           desktop/package-lock.json
 
     - id: cache-node-modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: node_modules
         key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
 
     - id: cache-desktop-node-modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: desktop/node_modules
         key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}

.github/actions/javascript/bumpVersion/index.js

@@ -2657,12 +2657,17 @@ createToken('XRANGELOOSE', `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAINLOOSE]}$`)
 
 // Coercion.
 // Extract anything that could conceivably be a part of a valid semver
-createToken('COERCE', `${'(^|[^\\d])' +
+createToken('COERCEPLAIN', `${'(^|[^\\d])' +
               '(\\d{1,'}${MAX_SAFE_COMPONENT_LENGTH}})` +
               `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?` +
-              `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?` +
+              `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?`)
+createToken('COERCE', `${src[t.COERCEPLAIN]}(?:$|[^\\d])`)
+createToken('COERCEFULL', src[t.COERCEPLAIN] +
+              `(?:${src[t.PRERELEASE]})?` +
+              `(?:${src[t.BUILD]})?` +
               `(?:$|[^\\d])`)
 createToken('COERCERTL', src[t.COERCE], true)
+createToken('COERCERTLFULL', src[t.COERCEFULL], true)
 
 // Tilde ranges.
 // Meaning is "reasonably at or greater than"

.github/actions/javascript/getGraphiteString/action.yml

@@ -0,0 +1,8 @@
+name: 'Get and Save graphite string'
+description: 'Parse reassure output.json file and create string which can be sent to the graphite server'
+outputs:
+  GRAPHITE_STRING:
+    description: String with reassure data which can be directly sent to the graphite server
+runs:
+  using: 'node20'
+  main: './index.js'

.github/actions/javascript/getGraphiteString/getGraphiteString.js

@@ -0,0 +1,53 @@
+const core = require('@actions/core');
+const github = require('@actions/github');
+const fs = require('fs');
+
+const run = () => {
+    // Prefix path to the graphite metric
+    const GRAPHITE_PATH = 'reassure';
+
+    let regressionOutput;
+    try {
+        regressionOutput = JSON.parse(fs.readFileSync('.reassure/output.json', 'utf8'));
+    } catch (err) {
+        // Handle errors that occur during file reading or parsing
+        console.error('Error while parsing output.json:', err.message);
+        core.setFailed(err);
+    }
+
+    const creationDate = regressionOutput.metadata.current.creationDate;
+    const timestampInMili = new Date(creationDate).getTime();
+
+    // Graphite accepts timestamp in seconds
+    const timestamp = Math.floor(timestampInMili / 1000);
+
+    // Get PR number from the github context
+    const prNumber = github.context.payload.pull_request.number;
+
+    // We need to combine all tests from the 4 buckets
+    const reassureTests = [...regressionOutput.meaningless, ...regressionOutput.significant, ...regressionOutput.countChanged, ...regressionOutput.added];
+
+    // Map through every test and create string for meanDuration and meanCount
+    // eslint-disable-next-line rulesdir/prefer-underscore-method
+    const graphiteString = reassureTests
+        .map((test) => {
+            const current = test.current;
+            // Graphite doesn't accept metrics name with space, we replace spaces with "-"
+            const formattedName = current.name.split(' ').join('-');
+
+            const renderDurationString = `${GRAPHITE_PATH}.PR-${prNumber}.${formattedName}.renderDuration ${current.meanDuration} ${timestamp}`;
+            const renderCountString = `${GRAPHITE_PATH}.PR-${prNumber}.${formattedName}.renderCount ${current.meanCount} ${timestamp}`;
+
+            return `${renderDurationString}\n${renderCountString}`;
+        })
+        .join('\n');
+
+    // Set generated graphite string to the github variable
+    core.setOutput('GRAPHITE_STRING', graphiteString);
+};
+
+if (require.main === module) {
+    run();
+}
+
+module.exports = run;