Merge remote-tracking branch 'origin/main' into sm/html-entities-take-2

forcedotcom · Oct 3, 2023 · 61dddfb · 61dddfb · svc-cli-bot · Oct 3, 2023
2 parents 67937d2 + becea57
commit 61dddfb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/perfScaleNut.yml b/.github/workflows/perfScaleNut.yml
@@ -20,10 +20,18 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
+          node-version: lts/*
           cache: yarn
-      - run: npm install -g @salesforce/cli --omit=dev
-      - run: yarn install
-      - run: yarn test:nuts:scale
+      - uses: nick-fields/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd
+        name: add CLI as global dependency
+        with:
+          command: npm install @salesforce/cli@nightly -g
+          timeout_minutes: 60
+      - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main
+      - run: |
+          yarn mocha test/nuts/scale/eda.nut.ts --timeout 500000
+          yarn mocha test/nuts/scale/lotsOfClasses.nut.ts --timeout 500000
+          yarn mocha test/nuts/scale/lotsOfClassesOneDir.nut.ts --timeout 500000
 
       # Run `github-action-benchmark` action
       - name: Store benchmark result

diff --git a/package.json b/package.json
@@ -101,7 +101,6 @@
     "repl": "node --inspect ./scripts/repl.js",
     "test": "wireit",
     "test:nuts": "mocha \"test/nuts/local/**/*.nut.ts\" --timeout 500000",
-    "test:nuts:scale": "mocha \"test/nuts/scale/eda.nut.ts\" --timeout 500000; mocha \"test/nuts/scale/lotsOfClasses.nut.ts\" --timeout 500000; mocha \"test/nuts/scale/lotsOfClassesOneDir.nut.ts\" --timeout 500000",
     "test:nuts:suggest": "mocha \"test/nuts/suggestType/suggestType.nut.ts\" --timeout 10000",
     "test:only": "wireit",
     "test:registry": "mocha ./test/registry/registryCompleteness.test.ts --timeout 50000",

diff --git a/test/nuts/scale/lotsOfClassesOneDir.nut.ts b/test/nuts/scale/lotsOfClassesOneDir.nut.ts
@@ -29,7 +29,7 @@ describe(`handles ${classCount.toLocaleString()} classes (${(
   before(async () => {
     session = await TestSession.create({
       project: {
-        name: 'lotsOfClasses',
+        name: 'lotsOfClassesOneDir',
       },
       devhubAuthStrategy: 'NONE',
     });
Benchmark suite	Current: `61dddfb`	Previous: `d1689dc`	Ratio
`eda-componentSetCreate-linux`	`278` ms	`259` ms	`1.07`
`eda-sourceToMdapi-linux`	`8945` ms	`7638` ms	`1.17`
`eda-sourceToZip-linux`	`5619` ms	`5252` ms	`1.07`
`eda-mdapiToSource-linux`	`4678` ms	`4464` ms	`1.05`
`lotsOfClasses-componentSetCreate-linux`	`501` ms	`524` ms	`0.96`
`lotsOfClasses-sourceToMdapi-linux`	`10890` ms	`10202` ms	`1.07`
`lotsOfClasses-sourceToZip-linux`	`8127` ms	`8028` ms	`1.01`
`lotsOfClasses-mdapiToSource-linux`	`4343` ms	`4850` ms	`0.90`
`lotsOfClassesOneDir-componentSetCreate-linux`	`851` ms	`860` ms	`0.99`
`lotsOfClassesOneDir-sourceToMdapi-linux`	`14394` ms	`13868` ms	`1.04`
`lotsOfClassesOneDir-sourceToZip-linux`	`12836` ms	`12512` ms	`1.03`
`lotsOfClassesOneDir-mdapiToSource-linux`	`8534` ms	`8578` ms	`0.99`
Benchmark suite	Current: `61dddfb`	Previous: `d1689dc`	Ratio
`eda-componentSetCreate-win32`	`631` ms	`441` ms	`1.43`
`eda-sourceToMdapi-win32`	`10152` ms	`8204` ms	`1.24`
`eda-sourceToZip-win32`	`7419` ms	`6755` ms	`1.10`
`eda-mdapiToSource-win32`	`9495` ms	`6806` ms	`1.40`
`lotsOfClasses-componentSetCreate-win32`	`1265` ms	`989` ms	`1.28`
`lotsOfClasses-sourceToMdapi-win32`	`18513` ms	`13488` ms	`1.37`
`lotsOfClasses-sourceToZip-win32`	`11050` ms	`8335` ms	`1.33`
`lotsOfClasses-mdapiToSource-win32`	`11650` ms	`8732` ms	`1.33`
`lotsOfClassesOneDir-componentSetCreate-win32`	`2006` ms	`1615` ms	`1.24`
`lotsOfClassesOneDir-sourceToMdapi-win32`	`27031` ms	`20083` ms	`1.35`
`lotsOfClassesOneDir-sourceToZip-win32`	`17861` ms	`13915` ms	`1.28`
`lotsOfClassesOneDir-mdapiToSource-win32`	`21147` ms	`15667` ms	`1.35`