From 4c34cc31dace17fe9ba7545dc7e61ffb8f1d90fc Mon Sep 17 00:00:00 2001
From: Santhosh Emmadoju <santhosh.e@salesforce.com>
Date: Sun, 26 Mar 2023 01:12:38 +0530
Subject: [PATCH 01/23] fix: use always forward slash for DEB and DE fullName

---
 src/resolve/adapters/digitalExperienceSourceAdapter.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/resolve/adapters/digitalExperienceSourceAdapter.ts b/src/resolve/adapters/digitalExperienceSourceAdapter.ts
index ecf24ea593..fea1d4aa3b 100644
--- a/src/resolve/adapters/digitalExperienceSourceAdapter.ts
+++ b/src/resolve/adapters/digitalExperienceSourceAdapter.ts
@@ -103,7 +103,7 @@ export class DigitalExperienceSourceAdapter extends BundleSourceAdapter {
 
   private getBundleName(contentPath: string): string {
     const bundlePath = this.getBundleMetadataXmlPath(contentPath);
-    return `${parentName(dirname(bundlePath))}${sep}${parentName(bundlePath)}`;
+    return `${parentName(dirname(bundlePath))}/${parentName(bundlePath)}`;
   }
 
   private getBundleMetadataXmlPath(path: string): string {
@@ -129,5 +129,4 @@ export class DigitalExperienceSourceAdapter extends BundleSourceAdapter {
  * @param contentPath This hook is called only after trimPathToContent() is called. so this will always be a folder structure
  * @returns name of type/apiName format
  */
-const calculateNameFromPath = (contentPath: string): string =>
-  `${parentName(contentPath)}${sep}${baseName(contentPath)}`;
+const calculateNameFromPath = (contentPath: string): string => `${parentName(contentPath)}/${baseName(contentPath)}`;

From 948c62102925669bcd3506608d790fa791d7a20a Mon Sep 17 00:00:00 2001
From: Santhosh Emmadoju <santhosh.e@salesforce.com>
Date: Sun, 26 Mar 2023 01:13:23 +0530
Subject: [PATCH 02/23] chore: auto-update metadata coverage in
 METADATA_SUPPORT.md

---
 METADATA_SUPPORT.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/METADATA_SUPPORT.md b/METADATA_SUPPORT.md
index f815ff48ab..f82e4d086b 100644
--- a/METADATA_SUPPORT.md
+++ b/METADATA_SUPPORT.md
@@ -565,11 +565,13 @@ v58 introduces the following new types.  Here's their current level of support
 |FundraisingConfig|❌|Not supported, but support could be added|
 |LicensingSettings|✅||
 |OmniChannelPricingSettings|✅||
+|PlatformEventSettings|✅||
 |ProcessFlowMigration|❌|Not supported, but support could be added|
 |ProductAttrDisplayConfig|❌|Not supported, but support could be added|
 |ProductSpecificationRecType|❌|Not supported, but support could be added|
 |ProductSpecificationType|❌|Not supported, but support could be added|
 |RecAlrtDataSrcExpSetDef|❌|Not supported, but support could be added|
+|RecordAlertTemplate|❌|Not supported, but support could be added|
 |SkillType|❌|Not supported, but support could be added|
 |Web3Settings|✅||
 |WebStoreBundle|❌|Not supported, but support could be added|

From 44501571ad121a151e8af56345b95bfb65bd71d1 Mon Sep 17 00:00:00 2001
From: Santhosh Emmadoju <santhosh.e@salesforce.com>
Date: Sun, 26 Mar 2023 01:46:54 +0530
Subject: [PATCH 03/23] chore: fix tests for windows os

---
 test/collections/componentSet.test.ts               | 13 ++++++-------
 .../digitalExperienceBundleConstants.ts             |  8 ++++----
 test/utils/filePathGenerator.test.ts                |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/test/collections/componentSet.test.ts b/test/collections/componentSet.test.ts
index 9547e1dfae..460273b39b 100644
--- a/test/collections/componentSet.test.ts
+++ b/test/collections/componentSet.test.ts
@@ -1257,8 +1257,9 @@ describe('ComponentSet', () => {
         type: digitalExperienceBundle.DEB_TYPE.id,
       };
 
-      const debMetaFilePath = join('path', 'to', 'digitalExperiences', 'site', 'foo', 'foo.digitalExperience-meta.xml');
-      expect(set.getComponentFilenamesByNameAndType(deb)).to.have.members([debMetaFilePath]);
+      expect(set.getComponentFilenamesByNameAndType(deb)).to.have.members([
+        digitalExperienceBundle.BUNDLE_META_FILE_PATH,
+      ]);
     });
 
     it('should correctly return DE (DigitalExperience) component file paths', () => {
@@ -1272,12 +1273,10 @@ describe('ComponentSet', () => {
         type: digitalExperienceBundle.DE_TYPE.id,
       };
 
-      const deViewHomePath = join('path', 'to', 'digitalExperiences', 'site', 'foo', 'sfdc_cms__view', 'home');
-
       expect(set.getComponentFilenamesByNameAndType(de)).to.have.members([
-        join(deViewHomePath, 'content.json'),
-        join(deViewHomePath, 'fr.json'),
-        join(deViewHomePath, '_meta.json'),
+        join(digitalExperienceBundle.HOME_VIEW_PATH, 'content.json'),
+        join(digitalExperienceBundle.HOME_VIEW_PATH, 'fr.json'),
+        join(digitalExperienceBundle.HOME_VIEW_PATH, '_meta.json'),
       ]);
     });
   });
diff --git a/test/mock/type-constants/digitalExperienceBundleConstants.ts b/test/mock/type-constants/digitalExperienceBundleConstants.ts
index a7211af964..83252e24d1 100644
--- a/test/mock/type-constants/digitalExperienceBundleConstants.ts
+++ b/test/mock/type-constants/digitalExperienceBundleConstants.ts
@@ -14,9 +14,9 @@ export const DEB_TYPE = registry.types.digitalexperiencebundle;
 // metaFileName = metaFileSuffix for DigitalExperience.
 export const DE_METAFILE = DE_TYPE.metaFileSuffix;
 
-export const BUNDLE_NAME = join('site', 'foo');
+export const BUNDLE_NAME = 'site/foo';
 export const BUNDLE_FULL_NAME = BUNDLE_NAME;
-export const HOME_VIEW_NAME = join('sfdc_cms__view', 'home');
+export const HOME_VIEW_NAME = 'sfdc_cms__view/home';
 export const HOME_VIEW_FULL_NAME = `${BUNDLE_FULL_NAME}.${HOME_VIEW_NAME}`;
 
 export const BUNDLE_META_FILE = `foo.${DEB_TYPE.suffix}${META_XML_SUFFIX}`;
@@ -25,9 +25,9 @@ export const HOME_VIEW_CONTENT_FILE = 'content.json';
 export const HOME_VIEW_FRENCH_VARIANT_FILE = 'fr.json';
 
 export const BASE_PATH = join('path', 'to', DEB_TYPE.directoryName);
-export const BUNDLE_PATH = join(BASE_PATH, BUNDLE_NAME);
+export const BUNDLE_PATH = join(BASE_PATH, 'site', 'foo');
 export const BUNDLE_META_FILE_PATH = join(BUNDLE_PATH, BUNDLE_META_FILE);
-export const HOME_VIEW_PATH = join(BUNDLE_PATH, HOME_VIEW_NAME);
+export const HOME_VIEW_PATH = join(BUNDLE_PATH, 'sfdc_cms__view', 'home');
 export const HOME_VIEW_CONTENT_FILE_PATH = join(HOME_VIEW_PATH, HOME_VIEW_CONTENT_FILE);
 export const HOME_VIEW_FRENCH_VARIANT_FILE_PATH = join(HOME_VIEW_PATH, HOME_VIEW_FRENCH_VARIANT_FILE);
 
diff --git a/test/utils/filePathGenerator.test.ts b/test/utils/filePathGenerator.test.ts
index 9f345dea92..a71c57a95a 100644
--- a/test/utils/filePathGenerator.test.ts
+++ b/test/utils/filePathGenerator.test.ts
@@ -187,7 +187,7 @@ const testData = {
     expectedFilePaths: [getFilePath('digitalExperiences/site/foo/foo.digitalExperience-meta.xml')],
     expectedComponents: [
       {
-        name: path.join('site', 'foo'), // as defined in digitalExperienceSourceAdapter.calculateNameFromPath()
+        name: 'site/foo', // as defined in digitalExperienceSourceAdapter.getBundleName()
         type: registryAccess.getTypeByName('DigitalExperienceBundle'),
         xml: getFilePath('digitalExperiences/site/foo/foo.digitalExperience-meta.xml'),
       },
@@ -199,7 +199,7 @@ const testData = {
     expectedFilePaths: [getFilePath('digitalExperiences/site/foo/sfdc_cms__view/home/_meta.json')],
     expectedComponents: [
       {
-        name: path.join('sfdc_cms__view', 'home'), // as defined in digitalExperienceSourceAdapter.calculateNameFromPath()
+        name: 'sfdc_cms__view/home', // as defined in digitalExperienceSourceAdapter.calculateNameFromPath()
         type: registryAccess.getTypeByName('DigitalExperience'),
       },
     ],

From 20a7751eb35027b3de3c5c056670b811689e9993 Mon Sep 17 00:00:00 2001
From: Santhosh Emmadoju <santhosh.e@salesforce.com>
Date: Sun, 26 Mar 2023 01:58:58 +0530
Subject: [PATCH 04/23] chore: fix tests for windows os

---
 .../adapters/digitalExperienceSourceAdapter.test.ts       | 8 ++++----
 test/resolve/metadataResolver.test.ts                     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/resolve/adapters/digitalExperienceSourceAdapter.test.ts b/test/resolve/adapters/digitalExperienceSourceAdapter.test.ts
index 290242044b..fef6f2d3b8 100644
--- a/test/resolve/adapters/digitalExperienceSourceAdapter.test.ts
+++ b/test/resolve/adapters/digitalExperienceSourceAdapter.test.ts
@@ -14,12 +14,12 @@ import { DE_METAFILE } from '../../mock/type-constants/digitalExperienceBundleCo
 describe('DigitalExperienceSourceAdapter', () => {
   const BASE_PATH = join('path', 'to', registry.types.digitalexperiencebundle.directoryName);
 
-  const BUNDLE_NAME = join('site', 'foo');
-  const BUNDLE_PATH = join(BASE_PATH, BUNDLE_NAME);
+  const BUNDLE_NAME = 'site/foo';
+  const BUNDLE_PATH = join(BASE_PATH, 'site', 'foo');
   const BUNDLE_META_FILE = join(BUNDLE_PATH, `foo.${registry.types.digitalexperiencebundle.suffix}${META_XML_SUFFIX}`);
 
-  const HOME_VIEW_NAME = join('sfdc_cms__view', 'home');
-  const HOME_VIEW_PATH = join(BUNDLE_PATH, HOME_VIEW_NAME);
+  const HOME_VIEW_NAME = 'sfdc_cms__view/home';
+  const HOME_VIEW_PATH = join(BUNDLE_PATH, 'sfdc_cms__view', 'home');
   const HOME_VIEW_CONTENT_FILE = join(HOME_VIEW_PATH, 'content.json');
   const HOME_VIEW_META_FILE = join(HOME_VIEW_PATH, DE_METAFILE);
   const HOME_VIEW_FRENCH_VARIANT_FILE = join(HOME_VIEW_PATH, 'fr.json');
diff --git a/test/resolve/metadataResolver.test.ts b/test/resolve/metadataResolver.test.ts
index f589c5248c..c15892550c 100644
--- a/test/resolve/metadataResolver.test.ts
+++ b/test/resolve/metadataResolver.test.ts
@@ -211,7 +211,7 @@ describe('MetadataResolver', () => {
         const mdResolver = new MetadataResolver(undefined, treeContainer);
         const parentComponent = new SourceComponent(
           {
-            name: join('site', 'foo'),
+            name: 'site/foo',
             type: registry.types.digitalexperiencebundle,
             xml: parent_meta_file,
           },
@@ -219,7 +219,7 @@ describe('MetadataResolver', () => {
         );
         const expectedComponent = new SourceComponent(
           {
-            name: join('sfdc_cms__view', 'home'),
+            name: 'sfdc_cms__view/home',
             type: registry.types.digitalexperiencebundle.children.types.digitalexperience,
             content: dirname(path),
             parent: parentComponent,

From c59e7bd5f6c522f4d00e82ce293b727e14bb9d9b Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Tue, 28 Mar 2023 10:06:04 -0500
Subject: [PATCH 05/23] test: run windows nuts on sdr

---
 .github/workflows/test.yml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dde098d2b6..0b8d9919c4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -88,7 +88,7 @@ jobs:
           - 'yarn test:nuts:deploy:testlevel'
           - 'yarn test:nuts:mdapi'
           - 'yarn test:nuts:retrieve'
-          - 'yarn test:nuts:specialTypes'
+          # - 'yarn test:nuts:specialTypes'
           - 'yarn test:nuts:tracking'
     uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
     with:
@@ -122,7 +122,7 @@ jobs:
           - 'yarn test:nuts:deploy:testlevel'
           - 'yarn test:nuts:mdapi'
           - 'yarn test:nuts:retrieve'
-          - 'yarn test:nuts:specialTypes'
+          # - 'yarn test:nuts:specialTypes'
           - 'yarn test:nuts:tracking'
     uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
     with:
@@ -135,3 +135,24 @@ jobs:
       preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
       os: windows-latest
     secrets: inherit
+
+  external-nuts-for-deb:
+    name: extNUTs-windows
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        command:
+          - 'yarn test:nuts:specialTypes'
+    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@sm/ext-nut-branch
+    with:
+      branch: sm/qa-771
+      packageName: '@salesforce/source-deploy-retrieve'
+      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+      command: ${{matrix.command}}
+      # the next 3 lines are likely unnecessary due to cache use
+      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+      os: ${{matrix.os}}
+    secrets: inherit

From 7c9fa39216b68bda87bc4048a74d99154f4d95ae Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Tue, 28 Mar 2023 15:19:35 +0000
Subject: [PATCH 06/23] test: record perf

---
 .../eda.json                                              | 8 ++++----
 .../lotsOfClasses.json                                    | 8 ++++----
 .../lotsOfClassesOneDir.json                              | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
index b9465e0b55..af9b8d1276 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 221.1766770000104
+    "duration": 224.440419999999
   },
   {
     "name": "sourceToMdapi",
-    "duration": 6279.265217999986
+    "duration": 6575.39690599998
   },
   {
     "name": "sourceToZip",
-    "duration": 4784.06782299999
+    "duration": 4566.2911430000095
   },
   {
     "name": "mdapiToSource",
-    "duration": 4182.580141999992
+    "duration": 4309.131727
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
index 742ae6cfbd..750a605fd4 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 458.3479590000061
+    "duration": 484.18207099998835
   },
   {
     "name": "sourceToMdapi",
-    "duration": 9421.391817999975
+    "duration": 9963.930322
   },
   {
     "name": "sourceToZip",
-    "duration": 6710.942861999996
+    "duration": 7209.721581999998
   },
   {
     "name": "mdapiToSource",
-    "duration": 4806.480233000009
+    "duration": 4784.424480999995
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
index 0e86bc1618..5d895766d9 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 753.9240889999783
+    "duration": 791.3028240000131
   },
   {
     "name": "sourceToMdapi",
-    "duration": 11511.726317000022
+    "duration": 13143.615026999993
   },
   {
     "name": "sourceToZip",
-    "duration": 10486.967529999965
+    "duration": 11015.141539000004
   },
   {
     "name": "mdapiToSource",
-    "duration": 8522.32658199995
+    "duration": 8771.649079000024
   }
 ]
\ No newline at end of file

From ea52ad5083bd08b2b8d1732bdf2d5755b6453595 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Tue, 28 Mar 2023 10:31:09 -0500
Subject: [PATCH 07/23] test: use deb script

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0b8d9919c4..e8e85eefa8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -137,13 +137,13 @@ jobs:
     secrets: inherit
 
   external-nuts-for-deb:
-    name: extNUTs-windows
+    name: extNUTs-deb
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
         command:
-          - 'yarn test:nuts:specialTypes'
+          - 'yarn test:nuts:deb'
     uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@sm/ext-nut-branch
     with:
       branch: sm/qa-771

From e49ef94dd016a74b9691ce892fc50140f6a7a45a Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Tue, 28 Mar 2023 15:42:12 +0000
Subject: [PATCH 08/23] test: record perf

---
 .../eda.json                                              | 8 ++++----
 .../lotsOfClasses.json                                    | 8 ++++----
 .../lotsOfClassesOneDir.json                              | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
index af9b8d1276..f348c8042c 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 224.440419999999
+    "duration": 225.8343520000053
   },
   {
     "name": "sourceToMdapi",
-    "duration": 6575.39690599998
+    "duration": 5856.92769099999
   },
   {
     "name": "sourceToZip",
-    "duration": 4566.2911430000095
+    "duration": 4476.312203000009
   },
   {
     "name": "mdapiToSource",
-    "duration": 4309.131727
+    "duration": 4131.2033590000065
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
index 750a605fd4..7b5f71c069 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 484.18207099998835
+    "duration": 437.7635350000055
   },
   {
     "name": "sourceToMdapi",
-    "duration": 9963.930322
+    "duration": 8528.896438000025
   },
   {
     "name": "sourceToZip",
-    "duration": 7209.721581999998
+    "duration": 6399.182284999988
   },
   {
     "name": "mdapiToSource",
-    "duration": 4784.424480999995
+    "duration": 4713.580621000001
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
index 5d895766d9..b84e8449f3 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 791.3028240000131
+    "duration": 747.8082170000125
   },
   {
     "name": "sourceToMdapi",
-    "duration": 13143.615026999993
+    "duration": 13580.087758000009
   },
   {
     "name": "sourceToZip",
-    "duration": 11015.141539000004
+    "duration": 10082.504368000024
   },
   {
     "name": "mdapiToSource",
-    "duration": 8771.649079000024
+    "duration": 8819.337939999998
   }
 ]
\ No newline at end of file

From fbeccc58e676bf7fc4846bd17d4c9a49d866fad5 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Tue, 28 Mar 2023 11:41:25 -0500
Subject: [PATCH 09/23] test: specialTypes and deb

---
 .github/workflows/test.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e8e85eefa8..cfa6abd2b9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -88,7 +88,7 @@ jobs:
           - 'yarn test:nuts:deploy:testlevel'
           - 'yarn test:nuts:mdapi'
           - 'yarn test:nuts:retrieve'
-          # - 'yarn test:nuts:specialTypes'
+          - 'yarn test:nuts:specialTypes'
           - 'yarn test:nuts:tracking'
     uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
     with:
@@ -122,7 +122,7 @@ jobs:
           - 'yarn test:nuts:deploy:testlevel'
           - 'yarn test:nuts:mdapi'
           - 'yarn test:nuts:retrieve'
-          # - 'yarn test:nuts:specialTypes'
+          - 'yarn test:nuts:specialTypes'
           - 'yarn test:nuts:tracking'
     uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
     with:
@@ -155,4 +155,5 @@ jobs:
       postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
       preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
       os: ${{matrix.os}}
+      attempts: 1
     secrets: inherit

From e1af01077ee92d53524188e979c01784e8acff91 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Tue, 28 Mar 2023 16:51:35 +0000
Subject: [PATCH 10/23] test: record perf

---
 .../eda.json                                              | 8 ++++----
 .../lotsOfClasses.json                                    | 8 ++++----
 .../lotsOfClassesOneDir.json                              | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
index f348c8042c..cdcba939e4 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 225.8343520000053
+    "duration": 220.4681120000023
   },
   {
     "name": "sourceToMdapi",
-    "duration": 5856.92769099999
+    "duration": 6668.6635559999995
   },
   {
     "name": "sourceToZip",
-    "duration": 4476.312203000009
+    "duration": 4174.313039000001
   },
   {
     "name": "mdapiToSource",
-    "duration": 4131.2033590000065
+    "duration": 3934.2770210000017
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
index 7b5f71c069..c056e58c86 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 437.7635350000055
+    "duration": 424.34093399999256
   },
   {
     "name": "sourceToMdapi",
-    "duration": 8528.896438000025
+    "duration": 8377.057564999981
   },
   {
     "name": "sourceToZip",
-    "duration": 6399.182284999988
+    "duration": 6661.8341939999955
   },
   {
     "name": "mdapiToSource",
-    "duration": 4713.580621000001
+    "duration": 4672.27502500001
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
index b84e8449f3..52770ffcf5 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 747.8082170000125
+    "duration": 740.2683130000078
   },
   {
     "name": "sourceToMdapi",
-    "duration": 13580.087758000009
+    "duration": 12204.972038999986
   },
   {
     "name": "sourceToZip",
-    "duration": 10082.504368000024
+    "duration": 9657.25232
   },
   {
     "name": "mdapiToSource",
-    "duration": 8819.337939999998
+    "duration": 8345.568347999972
   }
 ]
\ No newline at end of file

From e741f19b689796e73809ca5ded8379f600e72d97 Mon Sep 17 00:00:00 2001
From: Santhosh Emmadoju <santhosh.e@salesforce.com>
Date: Tue, 28 Mar 2023 22:47:13 +0530
Subject: [PATCH 11/23] chore: disable other nuts to test only deb

---
 .github/workflows/test.yml | 230 ++++++++++++++++++-------------------
 1 file changed, 115 insertions(+), 115 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cfa6abd2b9..6ec9dbd172 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,123 +18,123 @@ jobs:
   windows-unit-tests:
     needs: linux-unit-tests
     uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@main
-  nuts:
-    needs: linux-unit-tests
-    uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
-    secrets: inherit
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-      fail-fast: false
-    with:
-      os: ${{ matrix.os }}
-
-  perf-scale-nuts-linux:
-    uses: ./.github/workflows/perfScaleNut.yml
-    needs: nuts
-  perf-scale-nuts-windows:
-    uses: ./.github/workflows/perfScaleNut.yml
-    needs: nuts
-    with:
-      os: 'windows-latest'
-
-  # run a quick nut on each OS to populate the cache
-  # the following is highly duplicative to allow linux to start all the nuts without waiting for windows primer
-  extNuts-primer-linux:
-    name: extNUTs-linux-prime
-    needs: nuts
-    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-    with:
-      packageName: '@salesforce/source-deploy-retrieve'
-      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-      command: 'yarn test:nuts:manifest:create'
-      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-      os: 'ubuntu-latest'
-    secrets: inherit
+#  nuts:
+#    needs: linux-unit-tests
+#    uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
+#    secrets: inherit
+#    strategy:
+#      matrix:
+#        os: [ubuntu-latest, windows-latest]
+#      fail-fast: false
+#    with:
+#      os: ${{ matrix.os }}
 
-  extNuts-primer-windows:
-    name: extNUTs-windows-prime
-    needs: nuts
-    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-    with:
-      packageName: '@salesforce/source-deploy-retrieve'
-      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-      command: 'yarn test:nuts:manifest:create'
-      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-      os: 'windows-latest'
-    secrets: inherit
+#  perf-scale-nuts-linux:
+#    uses: ./.github/workflows/perfScaleNut.yml
+#    needs: nuts
+#  perf-scale-nuts-windows:
+#    uses: ./.github/workflows/perfScaleNut.yml
+#    needs: nuts
+#    with:
+#      os: 'windows-latest'
 
-  # now run the rest of the nuts for each os via cached version of al the setup steps
-  external-nuts-full-linux:
-    needs: [perf-scale-nuts-linux, extNuts-primer-linux]
-    name: extNUTs-linux
-    strategy:
-      fail-fast: false
-      matrix:
-        command:
-          - 'yarn test:nuts:convert'
-          - 'yarn test:nuts:delete'
-          - 'yarn test:nuts:deploy:async'
-          - 'yarn test:nuts:deploy:destructive'
-          - 'yarn test:nuts:deploy:manifest'
-          - 'yarn test:nuts:deploy:metadata'
-          - 'yarn test:nuts:deploy:quick'
-          - 'yarn test:nuts:deploy:rest'
-          - 'yarn test:nuts:deploy:sourcepath'
-          - 'yarn test:nuts:deploy:testlevel'
-          - 'yarn test:nuts:mdapi'
-          - 'yarn test:nuts:retrieve'
-          - 'yarn test:nuts:specialTypes'
-          - 'yarn test:nuts:tracking'
-    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-    with:
-      packageName: '@salesforce/source-deploy-retrieve'
-      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-      command: ${{matrix.command}}
-      # the next 3 lines are likely unnecessary due to cache use
-      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-      os: ubuntu-latest
-    secrets: inherit
-
-  # now run the rest of the nuts for each os via cached version of all the setup steps
-  external-nuts-full-windows:
-    needs: [perf-scale-nuts-windows, extNuts-primer-windows]
-    name: extNUTs-windows
-    strategy:
-      fail-fast: false
-      matrix:
-        command:
-          - 'yarn test:nuts:convert'
-          - 'yarn test:nuts:delete'
-          - 'yarn test:nuts:deploy:async'
-          - 'yarn test:nuts:deploy:destructive'
-          - 'yarn test:nuts:deploy:manifest'
-          - 'yarn test:nuts:deploy:metadata'
-          - 'yarn test:nuts:deploy:quick'
-          - 'yarn test:nuts:deploy:rest'
-          - 'yarn test:nuts:deploy:sourcepath'
-          - 'yarn test:nuts:deploy:testlevel'
-          - 'yarn test:nuts:mdapi'
-          - 'yarn test:nuts:retrieve'
-          - 'yarn test:nuts:specialTypes'
-          - 'yarn test:nuts:tracking'
-    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-    with:
-      packageName: '@salesforce/source-deploy-retrieve'
-      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-      command: ${{matrix.command}}
-      # the next 3 lines are likely unnecessary due to cache use
-      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-      os: windows-latest
-    secrets: inherit
+#  # run a quick nut on each OS to populate the cache
+#  # the following is highly duplicative to allow linux to start all the nuts without waiting for windows primer
+#  extNuts-primer-linux:
+#    name: extNUTs-linux-prime
+#    needs: nuts
+#    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+#    with:
+#      packageName: '@salesforce/source-deploy-retrieve'
+#      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+#      command: 'yarn test:nuts:manifest:create'
+#      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+#      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+#      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+#      os: 'ubuntu-latest'
+#    secrets: inherit
+#
+#  extNuts-primer-windows:
+#    name: extNUTs-windows-prime
+#    needs: nuts
+#    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+#    with:
+#      packageName: '@salesforce/source-deploy-retrieve'
+#      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+#      command: 'yarn test:nuts:manifest:create'
+#      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+#      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+#      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+#      os: 'windows-latest'
+#    secrets: inherit
+#
+#  # now run the rest of the nuts for each os via cached version of al the setup steps
+#  external-nuts-full-linux:
+#    needs: [perf-scale-nuts-linux, extNuts-primer-linux]
+#    name: extNUTs-linux
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        command:
+#          - 'yarn test:nuts:convert'
+#          - 'yarn test:nuts:delete'
+#          - 'yarn test:nuts:deploy:async'
+#          - 'yarn test:nuts:deploy:destructive'
+#          - 'yarn test:nuts:deploy:manifest'
+#          - 'yarn test:nuts:deploy:metadata'
+#          - 'yarn test:nuts:deploy:quick'
+#          - 'yarn test:nuts:deploy:rest'
+#          - 'yarn test:nuts:deploy:sourcepath'
+#          - 'yarn test:nuts:deploy:testlevel'
+#          - 'yarn test:nuts:mdapi'
+#          - 'yarn test:nuts:retrieve'
+#          - 'yarn test:nuts:specialTypes'
+#          - 'yarn test:nuts:tracking'
+#    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+#    with:
+#      packageName: '@salesforce/source-deploy-retrieve'
+#      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+#      command: ${{matrix.command}}
+#      # the next 3 lines are likely unnecessary due to cache use
+#      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+#      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+#      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+#      os: ubuntu-latest
+#    secrets: inherit
+#
+#  # now run the rest of the nuts for each os via cached version of all the setup steps
+#  external-nuts-full-windows:
+#    needs: [perf-scale-nuts-windows, extNuts-primer-windows]
+#    name: extNUTs-windows
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        command:
+#          - 'yarn test:nuts:convert'
+#          - 'yarn test:nuts:delete'
+#          - 'yarn test:nuts:deploy:async'
+#          - 'yarn test:nuts:deploy:destructive'
+#          - 'yarn test:nuts:deploy:manifest'
+#          - 'yarn test:nuts:deploy:metadata'
+#          - 'yarn test:nuts:deploy:quick'
+#          - 'yarn test:nuts:deploy:rest'
+#          - 'yarn test:nuts:deploy:sourcepath'
+#          - 'yarn test:nuts:deploy:testlevel'
+#          - 'yarn test:nuts:mdapi'
+#          - 'yarn test:nuts:retrieve'
+#          - 'yarn test:nuts:specialTypes'
+#          - 'yarn test:nuts:tracking'
+#    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+#    with:
+#      packageName: '@salesforce/source-deploy-retrieve'
+#      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+#      command: ${{matrix.command}}
+#      # the next 3 lines are likely unnecessary due to cache use
+#      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+#      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+#      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+#      os: windows-latest
+#    secrets: inherit
 
   external-nuts-for-deb:
     name: extNUTs-deb

From e9337079ead13ce28f806a4fea79feee75233a40 Mon Sep 17 00:00:00 2001
From: Santhosh Emmadoju <santhosh.e@salesforce.com>
Date: Tue, 28 Mar 2023 23:25:18 +0530
Subject: [PATCH 12/23] chore: run deb nuts only o windows

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6ec9dbd172..00cf22cee3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -141,7 +141,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [windows-latest]
         command:
           - 'yarn test:nuts:deb'
     uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@sm/ext-nut-branch

From 6ef26ead82691626b6bb68a02d858e51093bc392 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Tue, 28 Mar 2023 13:50:15 -0500
Subject: [PATCH 13/23] test: empty


From ccf97b455d423ce063dcbbfe468b45051a544f84 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Tue, 28 Mar 2023 14:09:26 -0500
Subject: [PATCH 14/23] test: no cache for deb

---
 .github/workflows/test.yml | 231 +++++++++++++++++++------------------
 1 file changed, 116 insertions(+), 115 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 00cf22cee3..5713c191ae 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,123 +18,123 @@ jobs:
   windows-unit-tests:
     needs: linux-unit-tests
     uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@main
-#  nuts:
-#    needs: linux-unit-tests
-#    uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
-#    secrets: inherit
-#    strategy:
-#      matrix:
-#        os: [ubuntu-latest, windows-latest]
-#      fail-fast: false
-#    with:
-#      os: ${{ matrix.os }}
+  #  nuts:
+  #    needs: linux-unit-tests
+  #    uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
+  #    secrets: inherit
+  #    strategy:
+  #      matrix:
+  #        os: [ubuntu-latest, windows-latest]
+  #      fail-fast: false
+  #    with:
+  #      os: ${{ matrix.os }}
 
-#  perf-scale-nuts-linux:
-#    uses: ./.github/workflows/perfScaleNut.yml
-#    needs: nuts
-#  perf-scale-nuts-windows:
-#    uses: ./.github/workflows/perfScaleNut.yml
-#    needs: nuts
-#    with:
-#      os: 'windows-latest'
+  #  perf-scale-nuts-linux:
+  #    uses: ./.github/workflows/perfScaleNut.yml
+  #    needs: nuts
+  #  perf-scale-nuts-windows:
+  #    uses: ./.github/workflows/perfScaleNut.yml
+  #    needs: nuts
+  #    with:
+  #      os: 'windows-latest'
 
-#  # run a quick nut on each OS to populate the cache
-#  # the following is highly duplicative to allow linux to start all the nuts without waiting for windows primer
-#  extNuts-primer-linux:
-#    name: extNUTs-linux-prime
-#    needs: nuts
-#    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-#    with:
-#      packageName: '@salesforce/source-deploy-retrieve'
-#      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-#      command: 'yarn test:nuts:manifest:create'
-#      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-#      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-#      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-#      os: 'ubuntu-latest'
-#    secrets: inherit
-#
-#  extNuts-primer-windows:
-#    name: extNUTs-windows-prime
-#    needs: nuts
-#    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-#    with:
-#      packageName: '@salesforce/source-deploy-retrieve'
-#      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-#      command: 'yarn test:nuts:manifest:create'
-#      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-#      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-#      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-#      os: 'windows-latest'
-#    secrets: inherit
-#
-#  # now run the rest of the nuts for each os via cached version of al the setup steps
-#  external-nuts-full-linux:
-#    needs: [perf-scale-nuts-linux, extNuts-primer-linux]
-#    name: extNUTs-linux
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        command:
-#          - 'yarn test:nuts:convert'
-#          - 'yarn test:nuts:delete'
-#          - 'yarn test:nuts:deploy:async'
-#          - 'yarn test:nuts:deploy:destructive'
-#          - 'yarn test:nuts:deploy:manifest'
-#          - 'yarn test:nuts:deploy:metadata'
-#          - 'yarn test:nuts:deploy:quick'
-#          - 'yarn test:nuts:deploy:rest'
-#          - 'yarn test:nuts:deploy:sourcepath'
-#          - 'yarn test:nuts:deploy:testlevel'
-#          - 'yarn test:nuts:mdapi'
-#          - 'yarn test:nuts:retrieve'
-#          - 'yarn test:nuts:specialTypes'
-#          - 'yarn test:nuts:tracking'
-#    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-#    with:
-#      packageName: '@salesforce/source-deploy-retrieve'
-#      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-#      command: ${{matrix.command}}
-#      # the next 3 lines are likely unnecessary due to cache use
-#      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-#      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-#      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-#      os: ubuntu-latest
-#    secrets: inherit
-#
-#  # now run the rest of the nuts for each os via cached version of all the setup steps
-#  external-nuts-full-windows:
-#    needs: [perf-scale-nuts-windows, extNuts-primer-windows]
-#    name: extNUTs-windows
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        command:
-#          - 'yarn test:nuts:convert'
-#          - 'yarn test:nuts:delete'
-#          - 'yarn test:nuts:deploy:async'
-#          - 'yarn test:nuts:deploy:destructive'
-#          - 'yarn test:nuts:deploy:manifest'
-#          - 'yarn test:nuts:deploy:metadata'
-#          - 'yarn test:nuts:deploy:quick'
-#          - 'yarn test:nuts:deploy:rest'
-#          - 'yarn test:nuts:deploy:sourcepath'
-#          - 'yarn test:nuts:deploy:testlevel'
-#          - 'yarn test:nuts:mdapi'
-#          - 'yarn test:nuts:retrieve'
-#          - 'yarn test:nuts:specialTypes'
-#          - 'yarn test:nuts:tracking'
-#    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-#    with:
-#      packageName: '@salesforce/source-deploy-retrieve'
-#      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-#      command: ${{matrix.command}}
-#      # the next 3 lines are likely unnecessary due to cache use
-#      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-#      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-#      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-#      os: windows-latest
-#    secrets: inherit
+  #  # run a quick nut on each OS to populate the cache
+  #  # the following is highly duplicative to allow linux to start all the nuts without waiting for windows primer
+  #  extNuts-primer-linux:
+  #    name: extNUTs-linux-prime
+  #    needs: nuts
+  #    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+  #    with:
+  #      packageName: '@salesforce/source-deploy-retrieve'
+  #      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+  #      command: 'yarn test:nuts:manifest:create'
+  #      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+  #      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+  #      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+  #      os: 'ubuntu-latest'
+  #    secrets: inherit
+  #
+  #  extNuts-primer-windows:
+  #    name: extNUTs-windows-prime
+  #    needs: nuts
+  #    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+  #    with:
+  #      packageName: '@salesforce/source-deploy-retrieve'
+  #      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+  #      command: 'yarn test:nuts:manifest:create'
+  #      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+  #      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+  #      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+  #      os: 'windows-latest'
+  #    secrets: inherit
+  #
+  #  # now run the rest of the nuts for each os via cached version of al the setup steps
+  #  external-nuts-full-linux:
+  #    needs: [perf-scale-nuts-linux, extNuts-primer-linux]
+  #    name: extNUTs-linux
+  #    strategy:
+  #      fail-fast: false
+  #      matrix:
+  #        command:
+  #          - 'yarn test:nuts:convert'
+  #          - 'yarn test:nuts:delete'
+  #          - 'yarn test:nuts:deploy:async'
+  #          - 'yarn test:nuts:deploy:destructive'
+  #          - 'yarn test:nuts:deploy:manifest'
+  #          - 'yarn test:nuts:deploy:metadata'
+  #          - 'yarn test:nuts:deploy:quick'
+  #          - 'yarn test:nuts:deploy:rest'
+  #          - 'yarn test:nuts:deploy:sourcepath'
+  #          - 'yarn test:nuts:deploy:testlevel'
+  #          - 'yarn test:nuts:mdapi'
+  #          - 'yarn test:nuts:retrieve'
+  #          - 'yarn test:nuts:specialTypes'
+  #          - 'yarn test:nuts:tracking'
+  #    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+  #    with:
+  #      packageName: '@salesforce/source-deploy-retrieve'
+  #      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+  #      command: ${{matrix.command}}
+  #      # the next 3 lines are likely unnecessary due to cache use
+  #      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+  #      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+  #      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+  #      os: ubuntu-latest
+  #    secrets: inherit
+  #
+  #  # now run the rest of the nuts for each os via cached version of all the setup steps
+  #  external-nuts-full-windows:
+  #    needs: [perf-scale-nuts-windows, extNuts-primer-windows]
+  #    name: extNUTs-windows
+  #    strategy:
+  #      fail-fast: false
+  #      matrix:
+  #        command:
+  #          - 'yarn test:nuts:convert'
+  #          - 'yarn test:nuts:delete'
+  #          - 'yarn test:nuts:deploy:async'
+  #          - 'yarn test:nuts:deploy:destructive'
+  #          - 'yarn test:nuts:deploy:manifest'
+  #          - 'yarn test:nuts:deploy:metadata'
+  #          - 'yarn test:nuts:deploy:quick'
+  #          - 'yarn test:nuts:deploy:rest'
+  #          - 'yarn test:nuts:deploy:sourcepath'
+  #          - 'yarn test:nuts:deploy:testlevel'
+  #          - 'yarn test:nuts:mdapi'
+  #          - 'yarn test:nuts:retrieve'
+  #          - 'yarn test:nuts:specialTypes'
+  #          - 'yarn test:nuts:tracking'
+  #    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+  #    with:
+  #      packageName: '@salesforce/source-deploy-retrieve'
+  #      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+  #      command: ${{matrix.command}}
+  #      # the next 3 lines are likely unnecessary due to cache use
+  #      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+  #      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+  #      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+  #      os: windows-latest
+  #    secrets: inherit
 
   external-nuts-for-deb:
     name: extNUTs-deb
@@ -156,4 +156,5 @@ jobs:
       preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
       os: ${{matrix.os}}
       attempts: 1
+      useCache: false
     secrets: inherit

From 2c22fc648e58ad9b940000f123126cd9ce1a2cd2 Mon Sep 17 00:00:00 2001
From: Santhosh Emmadoju <santhosh.e@salesforce.com>
Date: Wed, 29 Mar 2023 01:44:24 +0530
Subject: [PATCH 15/23] chore: run deb nuts

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5713c191ae..b655b4b648 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
   windows-unit-tests:
     needs: linux-unit-tests
     uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@main
-  #  nuts:
+  #   nuts:
   #    needs: linux-unit-tests
   #    uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
   #    secrets: inherit

From 33b39afc8c55590782204aa21b0b6d7ff35c2f3e Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Tue, 28 Mar 2023 17:10:31 -0500
Subject: [PATCH 16/23] test: enable deb nuts

---
 .github/workflows/test.yml | 225 +++++++++++++++++--------------------
 1 file changed, 102 insertions(+), 123 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b655b4b648..2616268f36 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,135 +18,116 @@ jobs:
   windows-unit-tests:
     needs: linux-unit-tests
     uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@main
-  #   nuts:
-  #    needs: linux-unit-tests
-  #    uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
-  #    secrets: inherit
-  #    strategy:
-  #      matrix:
-  #        os: [ubuntu-latest, windows-latest]
-  #      fail-fast: false
-  #    with:
-  #      os: ${{ matrix.os }}
+  nuts:
+    needs: linux-unit-tests
+    uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
+    secrets: inherit
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+      fail-fast: false
+    with:
+      os: ${{ matrix.os }}
 
-  #  perf-scale-nuts-linux:
-  #    uses: ./.github/workflows/perfScaleNut.yml
-  #    needs: nuts
-  #  perf-scale-nuts-windows:
-  #    uses: ./.github/workflows/perfScaleNut.yml
-  #    needs: nuts
-  #    with:
-  #      os: 'windows-latest'
+  perf-scale-nuts-linux:
+    uses: ./.github/workflows/perfScaleNut.yml
+    needs: nuts
+  perf-scale-nuts-windows:
+    uses: ./.github/workflows/perfScaleNut.yml
+    needs: nuts
+    with:
+      os: 'windows-latest'
 
-  #  # run a quick nut on each OS to populate the cache
-  #  # the following is highly duplicative to allow linux to start all the nuts without waiting for windows primer
-  #  extNuts-primer-linux:
-  #    name: extNUTs-linux-prime
-  #    needs: nuts
-  #    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-  #    with:
-  #      packageName: '@salesforce/source-deploy-retrieve'
-  #      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-  #      command: 'yarn test:nuts:manifest:create'
-  #      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-  #      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-  #      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-  #      os: 'ubuntu-latest'
-  #    secrets: inherit
-  #
-  #  extNuts-primer-windows:
-  #    name: extNUTs-windows-prime
-  #    needs: nuts
-  #    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-  #    with:
-  #      packageName: '@salesforce/source-deploy-retrieve'
-  #      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-  #      command: 'yarn test:nuts:manifest:create'
-  #      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-  #      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-  #      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-  #      os: 'windows-latest'
-  #    secrets: inherit
-  #
-  #  # now run the rest of the nuts for each os via cached version of al the setup steps
-  #  external-nuts-full-linux:
-  #    needs: [perf-scale-nuts-linux, extNuts-primer-linux]
-  #    name: extNUTs-linux
-  #    strategy:
-  #      fail-fast: false
-  #      matrix:
-  #        command:
-  #          - 'yarn test:nuts:convert'
-  #          - 'yarn test:nuts:delete'
-  #          - 'yarn test:nuts:deploy:async'
-  #          - 'yarn test:nuts:deploy:destructive'
-  #          - 'yarn test:nuts:deploy:manifest'
-  #          - 'yarn test:nuts:deploy:metadata'
-  #          - 'yarn test:nuts:deploy:quick'
-  #          - 'yarn test:nuts:deploy:rest'
-  #          - 'yarn test:nuts:deploy:sourcepath'
-  #          - 'yarn test:nuts:deploy:testlevel'
-  #          - 'yarn test:nuts:mdapi'
-  #          - 'yarn test:nuts:retrieve'
-  #          - 'yarn test:nuts:specialTypes'
-  #          - 'yarn test:nuts:tracking'
-  #    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-  #    with:
-  #      packageName: '@salesforce/source-deploy-retrieve'
-  #      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-  #      command: ${{matrix.command}}
-  #      # the next 3 lines are likely unnecessary due to cache use
-  #      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-  #      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-  #      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-  #      os: ubuntu-latest
-  #    secrets: inherit
-  #
-  #  # now run the rest of the nuts for each os via cached version of all the setup steps
-  #  external-nuts-full-windows:
-  #    needs: [perf-scale-nuts-windows, extNuts-primer-windows]
-  #    name: extNUTs-windows
-  #    strategy:
-  #      fail-fast: false
-  #      matrix:
-  #        command:
-  #          - 'yarn test:nuts:convert'
-  #          - 'yarn test:nuts:delete'
-  #          - 'yarn test:nuts:deploy:async'
-  #          - 'yarn test:nuts:deploy:destructive'
-  #          - 'yarn test:nuts:deploy:manifest'
-  #          - 'yarn test:nuts:deploy:metadata'
-  #          - 'yarn test:nuts:deploy:quick'
-  #          - 'yarn test:nuts:deploy:rest'
-  #          - 'yarn test:nuts:deploy:sourcepath'
-  #          - 'yarn test:nuts:deploy:testlevel'
-  #          - 'yarn test:nuts:mdapi'
-  #          - 'yarn test:nuts:retrieve'
-  #          - 'yarn test:nuts:specialTypes'
-  #          - 'yarn test:nuts:tracking'
-  #    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-  #    with:
-  #      packageName: '@salesforce/source-deploy-retrieve'
-  #      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-  #      command: ${{matrix.command}}
-  #      # the next 3 lines are likely unnecessary due to cache use
-  #      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
-  #      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
-  #      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-  #      os: windows-latest
-  #    secrets: inherit
+  # run a quick nut on each OS to populate the cache
+  # the following is highly duplicative to allow linux to start all the nuts without waiting for windows primer
+  extNuts-primer-linux:
+    name: extNUTs-linux-prime
+    needs: nuts
+    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+    with:
+      packageName: '@salesforce/source-deploy-retrieve'
+      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+      command: 'yarn test:nuts:manifest:create'
+      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+      os: 'ubuntu-latest'
+    secrets: inherit
+
+  extNuts-primer-windows:
+    name: extNUTs-windows-prime
+    needs: nuts
+    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+    with:
+      packageName: '@salesforce/source-deploy-retrieve'
+      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+      command: 'yarn test:nuts:manifest:create'
+      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+      os: 'windows-latest'
+    secrets: inherit
+
+  # now run the rest of the nuts for each os via cached version of al the setup steps
+  external-nuts-full-linux:
+    needs: [perf-scale-nuts-linux, extNuts-primer-linux]
+    name: extNUTs-linux
+    strategy:
+      fail-fast: false
+      matrix:
+        command:
+          - 'yarn test:nuts:convert'
+          - 'yarn test:nuts:deb'
+          - 'yarn test:nuts:delete'
+          - 'yarn test:nuts:deploy:async'
+          - 'yarn test:nuts:deploy:destructive'
+          - 'yarn test:nuts:deploy:manifest'
+          - 'yarn test:nuts:deploy:metadata'
+          - 'yarn test:nuts:deploy:quick'
+          - 'yarn test:nuts:deploy:rest'
+          - 'yarn test:nuts:deploy:sourcepath'
+          - 'yarn test:nuts:deploy:testlevel'
+          - 'yarn test:nuts:mdapi'
+          - 'yarn test:nuts:retrieve'
+          - 'yarn test:nuts:specialTypes'
+          - 'yarn test:nuts:tracking'
+    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+    with:
+      packageName: '@salesforce/source-deploy-retrieve'
+      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
+      command: ${{matrix.command}}
+      # the next 3 lines are likely unnecessary due to cache use
+      preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
+      postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
+      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
+      os: ubuntu-latest
+    secrets: inherit
 
-  external-nuts-for-deb:
-    name: extNUTs-deb
+  # now run the rest of the nuts for each os via cached version of all the setup steps
+  external-nuts-full-windows:
+    needs: [perf-scale-nuts-windows, extNuts-primer-windows]
+    name: extNUTs-windows
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest]
         command:
+          - 'yarn test:nuts:convert'
           - 'yarn test:nuts:deb'
-    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@sm/ext-nut-branch
+          - 'yarn test:nuts:delete'
+          - 'yarn test:nuts:deploy:async'
+          - 'yarn test:nuts:deploy:destructive'
+          - 'yarn test:nuts:deploy:manifest'
+          - 'yarn test:nuts:deploy:metadata'
+          - 'yarn test:nuts:deploy:quick'
+          - 'yarn test:nuts:deploy:rest'
+          - 'yarn test:nuts:deploy:sourcepath'
+          - 'yarn test:nuts:deploy:testlevel'
+          - 'yarn test:nuts:mdapi'
+          - 'yarn test:nuts:retrieve'
+          - 'yarn test:nuts:specialTypes'
+          - 'yarn test:nuts:tracking'
+    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
     with:
-      branch: sm/qa-771
       packageName: '@salesforce/source-deploy-retrieve'
       externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
       command: ${{matrix.command}}
@@ -154,7 +135,5 @@ jobs:
       preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
       postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
       preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
-      os: ${{matrix.os}}
-      attempts: 1
-      useCache: false
+      os: windows-latest
     secrets: inherit

From 2b002fda5306105b59cb8a4a847926ac1a2560bd Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Tue, 28 Mar 2023 22:18:20 +0000
Subject: [PATCH 17/23] test: record perf

---
 .../eda.json                                              | 8 ++++----
 .../lotsOfClasses.json                                    | 8 ++++----
 .../lotsOfClassesOneDir.json                              | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
index cdcba939e4..bd3718bad4 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 220.4681120000023
+    "duration": 220.98211799998535
   },
   {
     "name": "sourceToMdapi",
-    "duration": 6668.6635559999995
+    "duration": 5883.410992000019
   },
   {
     "name": "sourceToZip",
-    "duration": 4174.313039000001
+    "duration": 4195.635892999999
   },
   {
     "name": "mdapiToSource",
-    "duration": 3934.2770210000017
+    "duration": 4158.288854999992
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
index c056e58c86..c209eb9d11 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 424.34093399999256
+    "duration": 423.7058580000303
   },
   {
     "name": "sourceToMdapi",
-    "duration": 8377.057564999981
+    "duration": 9075.414397999994
   },
   {
     "name": "sourceToZip",
-    "duration": 6661.8341939999955
+    "duration": 6641.056959000009
   },
   {
     "name": "mdapiToSource",
-    "duration": 4672.27502500001
+    "duration": 4751.506416000018
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
index 52770ffcf5..ec06618cca 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 740.2683130000078
+    "duration": 761.5197770000086
   },
   {
     "name": "sourceToMdapi",
-    "duration": 12204.972038999986
+    "duration": 12648.731094999996
   },
   {
     "name": "sourceToZip",
-    "duration": 9657.25232
+    "duration": 10670.394476999994
   },
   {
     "name": "mdapiToSource",
-    "duration": 8345.568347999972
+    "duration": 8812.610347000009
   }
 ]
\ No newline at end of file

From fc2fd46a193b5244e311dfd2be5e75e1a67f5206 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Tue, 28 Mar 2023 18:12:02 -0500
Subject: [PATCH 18/23] test: once more against the plugin-source branch since
 specialTypes nut fail

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2616268f36..1516548924 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -101,6 +101,7 @@ jobs:
       postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
       preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
       os: ubuntu-latest
+      branch: sm/qa-771
     secrets: inherit
 
   # now run the rest of the nuts for each os via cached version of all the setup steps
@@ -136,4 +137,5 @@ jobs:
       postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
       preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
       os: windows-latest
+      branch: sm/qa-771
     secrets: inherit

From 5615b8e58312e626406147c9ec09904e6678ec16 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Tue, 28 Mar 2023 23:19:48 +0000
Subject: [PATCH 19/23] test: record perf

---
 .../eda.json                                           | 10 +++++-----
 .../lotsOfClasses.json                                 | 10 +++++-----
 .../lotsOfClassesOneDir.json                           | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/eda.json
index 3dc62a0a71..20d0e935f0 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/eda.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 260.3101150000002
+    "duration": 233.7760089999938
   },
   {
     "name": "sourceToMdapi",
-    "duration": 6198.695180999988
+    "duration": 6753.4969190000265
   },
   {
     "name": "sourceToZip",
-    "duration": 5268.037049999999
+    "duration": 4798.63064399999
   },
   {
     "name": "mdapiToSource",
-    "duration": 4821.471162000002
+    "duration": 4414.505631999986
   }
-]
+]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClasses.json
index 6dbca24837..85ef1fe0b1 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClasses.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 564.117453999992
+    "duration": 466.52529300001333
   },
   {
     "name": "sourceToMdapi",
-    "duration": 10235.299335999996
+    "duration": 9316.263336000004
   },
   {
     "name": "sourceToZip",
-    "duration": 8152.812848000001
+    "duration": 7580.588098000007
   },
   {
     "name": "mdapiToSource",
-    "duration": 6198.941200000001
+    "duration": 5279.707100999978
   }
-]
+]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClassesOneDir.json
index 5d85148e6c..1427ee1d3e 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClassesOneDir.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 897.9357010000094
+    "duration": 793.3032280000043
   },
   {
     "name": "sourceToMdapi",
-    "duration": 15844.131036000006
+    "duration": 13581.316970999993
   },
   {
     "name": "sourceToZip",
-    "duration": 13365.39555299998
+    "duration": 10966.470612999983
   },
   {
     "name": "mdapiToSource",
-    "duration": 10212.036124000006
+    "duration": 9404.23107400001
   }
-]
+]
\ No newline at end of file

From 5673370deadeba9475baf76c7716fada9dfa34d2 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Wed, 29 Mar 2023 09:42:11 +0000
Subject: [PATCH 20/23] test: record perf

---
 .../eda.json                                              | 8 ++++----
 .../lotsOfClasses.json                                    | 8 ++++----
 .../lotsOfClassesOneDir.json                              | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/eda.json
index 0cea0a60e2..dee04411cb 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/eda.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 207.436284000054
+    "duration": 206.30329700000584
   },
   {
     "name": "sourceToMdapi",
-    "duration": 5423.031130000018
+    "duration": 6021.639065999887
   },
   {
     "name": "sourceToZip",
-    "duration": 5202.063126999885
+    "duration": 4751.296789000044
   },
   {
     "name": "mdapiToSource",
-    "duration": 3417.4116909999866
+    "duration": 3580.558422999922
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClasses.json
index 5f424245c4..793cf96b90 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClasses.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 444.3853680000175
+    "duration": 461.1784739999566
   },
   {
     "name": "sourceToMdapi",
-    "duration": 8262.888810999924
+    "duration": 8356.817245000042
   },
   {
     "name": "sourceToZip",
-    "duration": 7476.526809000177
+    "duration": 6477.727012000047
   },
   {
     "name": "mdapiToSource",
-    "duration": 4032.80767800007
+    "duration": 4043.2264469999354
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClassesOneDir.json
index c799476919..cae82e53a0 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClassesOneDir.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 707.5937909998465
+    "duration": 707.8752579999855
   },
   {
     "name": "sourceToMdapi",
-    "duration": 10896.007658000104
+    "duration": 10978.774819999933
   },
   {
     "name": "sourceToZip",
-    "duration": 9609.415148
+    "duration": 10238.615633000038
   },
   {
     "name": "mdapiToSource",
-    "duration": 6808.866952999961
+    "duration": 7042.208344000042
   }
 ]
\ No newline at end of file

From 970476f17eb9f49a35ac8465cae7290ed718ae89 Mon Sep 17 00:00:00 2001
From: Santhosh Emmadoju <santhosh.e@salesforce.com>
Date: Wed, 29 Mar 2023 16:16:43 +0530
Subject: [PATCH 21/23] test: run deb nuts


From 5cc60dbff8d82616e139edf0edab0bef3069e90e Mon Sep 17 00:00:00 2001
From: Santhosh Emmadoju <santhosh.e@salesforce.com>
Date: Wed, 29 Mar 2023 16:34:11 +0530
Subject: [PATCH 22/23] test: run deb nuts

---
 test/mock/type-constants/digitalExperienceBundleConstants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/mock/type-constants/digitalExperienceBundleConstants.ts b/test/mock/type-constants/digitalExperienceBundleConstants.ts
index 83252e24d1..f77a244afa 100644
--- a/test/mock/type-constants/digitalExperienceBundleConstants.ts
+++ b/test/mock/type-constants/digitalExperienceBundleConstants.ts
@@ -8,8 +8,8 @@ import { join } from 'path';
 import { registry, SourceComponent } from '../../../src';
 import { META_XML_SUFFIX } from '../../../src/common';
 
-export const DE_TYPE = registry.types.digitalexperiencebundle.children.types.digitalexperience;
 export const DEB_TYPE = registry.types.digitalexperiencebundle;
+export const DE_TYPE = DEB_TYPE.children.types.digitalexperience;
 
 // metaFileName = metaFileSuffix for DigitalExperience.
 export const DE_METAFILE = DE_TYPE.metaFileSuffix;

From 242dc0a7c77007fd30940275c5557d61c0064527 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Wed, 29 Mar 2023 11:14:30 +0000
Subject: [PATCH 23/23] test: record perf

---
 .../eda.json                                              | 8 ++++----
 .../lotsOfClasses.json                                    | 8 ++++----
 .../lotsOfClassesOneDir.json                              | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/eda.json
index dee04411cb..3635f3af03 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/eda.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 206.30329700000584
+    "duration": 208.37945000000764
   },
   {
     "name": "sourceToMdapi",
-    "duration": 6021.639065999887
+    "duration": 5163.694585999998
   },
   {
     "name": "sourceToZip",
-    "duration": 4751.296789000044
+    "duration": 4249.0233250000165
   },
   {
     "name": "mdapiToSource",
-    "duration": 3580.558422999922
+    "duration": 3356.330946000002
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClasses.json
index 793cf96b90..2260f3bc16 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClasses.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 461.1784739999566
+    "duration": 408.6128360000148
   },
   {
     "name": "sourceToMdapi",
-    "duration": 8356.817245000042
+    "duration": 7221.068067000015
   },
   {
     "name": "sourceToZip",
-    "duration": 6477.727012000047
+    "duration": 5880.985977000004
   },
   {
     "name": "mdapiToSource",
-    "duration": 4043.2264469999354
+    "duration": 4112.393477000005
   }
 ]
\ No newline at end of file
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClassesOneDir.json
index cae82e53a0..6828e6992c 100644
--- a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClassesOneDir.json
+++ b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8370C-CPU-2-80GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 707.8752579999855
+    "duration": 707.7821399999957
   },
   {
     "name": "sourceToMdapi",
-    "duration": 10978.774819999933
+    "duration": 9948.782891999988
   },
   {
     "name": "sourceToZip",
-    "duration": 10238.615633000038
+    "duration": 9234.353405000002
   },
   {
     "name": "mdapiToSource",
-    "duration": 7042.208344000042
+    "duration": 7288.00951600002
   }
 ]
\ No newline at end of file