Merge branch 'main' into suite-dir

Author: jakebailey

package.json

@@ -9,15 +9,15 @@
     },
     "devDependencies": {
         "@types/node": "^18.19.4",
-        "@typescript-eslint/eslint-plugin": "^6.18.0",
-        "@typescript-eslint/parser": "^6.18.0",
+        "@typescript-eslint/eslint-plugin": "^6.17.0",
+        "@typescript-eslint/parser": "^6.17.0",
         "dprint": "^0.45.0",
         "eslint": "^8.56.0",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unicorn": "^50.0.1",
         "typescript": "^5.3.3"
     },
-    "packageManager": "pnpm@8.14.0+sha256.9cebf61abd83f68177b29484da72da9751390eaad46dfc3072d266bfbb1ba7bf",
+    "packageManager": "pnpm@8.8.0",
     "scripts": {
         "build": "pnpm run --filter './scripts' --filter './ts-perf' build"
     },

pnpm-lock.yaml

@@ -169,8 +169,8 @@ function setVariable(name: string, value: string | number | boolean) {
 interface Job {
     TSPERF_JOB_KIND: JobKind;
     TSPERF_JOB_NAME: JobName;
-    TSPERF_JOB_HOSTS: HostName;
-    TSPERF_JOB_SCENARIOS: ScenarioName;
+    TSPERF_JOB_HOST: HostName;
+    TSPERF_JOB_SCENARIO: ScenarioName;
     TSPERF_JOB_ITERATIONS: number;
     TSPERF_JOB_LOCATION: ScenarioLocation;
 }
@@ -205,8 +205,8 @@ for (const jobKind of allJobKinds) {
             matrix[agent][jobName] = {
                 TSPERF_JOB_KIND: jobKind,
                 TSPERF_JOB_NAME: jobName,
-                TSPERF_JOB_HOSTS: host,
-                TSPERF_JOB_SCENARIOS: scenario.name,
+                TSPERF_JOB_HOST: host,
+                TSPERF_JOB_SCENARIO: scenario.name,
                 TSPERF_JOB_ITERATIONS: p.iterations,
                 TSPERF_JOB_LOCATION: scenario.location,
             };

scripts/src/generateMatrix.ts

@@ -29,34 +29,10 @@ assert(fn, `Unknown subcommand ${subcommand}`);
 
 await fn();
 
-function createFlags(name: string, hostVars: (string | undefined)[]): string[] {
-    const hosts = new Set<string>();
-    for (const arg of hostVars) {
-        for (const host of arg?.split(",") ?? []) {
-            hosts.add(host);
-        }
-    }
-
-    const args = [];
-    for (const host of hosts) {
-        args.push(`--${name}`);
-        args.push(host);
-    }
-
-    return args;
-}
-
 async function installHosts() {
-    const hostArgs = createFlags(
-        "host",
-        [
-            process.env.TSPERF_TSC_HOSTS,
-            process.env.TSPERF_TSSERVER_HOSTS,
-            process.env.TSPERF_STARTUP_HOSTS,
-        ],
-    );
-
-    await $`node ${tsperfExe} host install ${hostArgs}`;
+    const host = getNonEmptyEnv("TSPERF_JOB_HOST");
+
+    await $`node ${tsperfExe} host install --host ${host}`;
 }
 
 function getLocationBasedArgs(benchmarking: boolean) {
@@ -84,14 +60,14 @@ async function getCommonBenchmarkArgs() {
         await $`mkdir -p ${path.dirname(args.save)}`;
         tsperfArgs.push("--save", args.save);
 
-        const hosts = getNonEmptyEnv("TSPERF_JOB_HOSTS");
-        const scenarios = getNonEmptyEnv("TSPERF_JOB_SCENARIOS");
+        const host = getNonEmptyEnv("TSPERF_JOB_HOST");
+        const scenario = getNonEmptyEnv("TSPERF_JOB_SCENARIO");
         const iterations = getNonEmptyEnv("TSPERF_JOB_ITERATIONS");
         const cpu = getNonEmptyEnv("TSPERF_AGENT_BENCHMARK_CPU");
         const info = await getRepoInfo(args.builtDir);
 
-        tsperfArgs.push(...createFlags("host", [hosts]));
-        tsperfArgs.push(...createFlags("scenario", [scenarios]));
+        tsperfArgs.push("--host", host);
+        tsperfArgs.push("--scenario", scenario);
         tsperfArgs.push("--iterations", iterations);
         tsperfArgs.push("--cpus", cpu);