+

glimmerjs · Dec 22, 2023 · 8cf4bd7 · 8cf4bd7
1 parent 28ccccf
commit 8cf4bd7
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/bin/setup-bench.mjs b/bin/setup-bench.mjs
@@ -68,15 +68,17 @@ const EXPERIMENT_URL = `http://localhost:${EXPERIMENT_PORT}`;
 
 // setup control
 try {
-  await $`cd ${CONTROL_DIR} && git clone ${upstreamUrlStr} ${CONTROL_DIR} && git checkout ${controlBranchName} && rm -rf benchmark && cp -r ${BENCHMARK_FOLDER} ./benchmark && pnpm install  --no-frozen-lockfile && pnpm build`;
+  cd(CONTROL_DIR);
+  await $`git clone ${upstreamUrlStr} ${CONTROL_DIR} && git checkout ${controlBranchName} && rm -rf benchmark && cp -r ${BENCHMARK_FOLDER} ./benchmark && pnpm install  --no-frozen-lockfile && pnpm build`;
 } catch(e) {
   console.error(e);
   // should be FINE
 }
 
 // setup experiment
 try {
-  await $`cd ${EXPERIMENT_DIR} && git clone ${originUrlStr} ${EXPERIMENT_DIR} && git checkout ${experimentBranchName} && rm -rf benchmark && cp -r ${BENCHMARK_FOLDER} ./benchmark && pnpm install  --no-frozen-lockfile && pnpm build`;
+  cd(EXPERIMENT_DIR);
+  await $`git clone ${originUrlStr} ${EXPERIMENT_DIR} && git checkout ${experimentBranchName} && rm -rf benchmark && cp -r ${BENCHMARK_FOLDER} ./benchmark && pnpm install  --no-frozen-lockfile && pnpm build`;
 } catch(e) {
   // should be FINE
   console.error(e);
@@ -88,27 +90,29 @@ try {
 // replace incorrect paths in package json
 
 // in control
-await $`cd ${CONTROL_DIR} && find ./packages -name 'package.json' -exec sed -i '' 's|"main": "index.ts",|"module": "./dist/prod/index.js","main": "./dist/prod/index.js",|g' {} \\;`;
-await $`cd ${CONTROL_DIR} && find ./packages -name 'package.json' -exec sed -i '' 's|"main": "./dist/index.js",|"module": "./dist/prod/index.js","main": "./dist/prod/index.js",|g' {} \\;`;
-await $`cd ${CONTROL_DIR} && find ./packages -name 'package.json' -exec sed -i '' 's|"import": "./dist/index.js"|"import": "./dist/prod/index.js"|g' {} \\;`;
+cd(CONTROL_DIR);
+await $`find ./packages -name 'package.json' -exec sed -i '' 's|"main": "index.ts",|"module": "./dist/prod/index.js","main": "./dist/prod/index.js",|g' {} \\;`;
+await $`find ./packages -name 'package.json' -exec sed -i '' 's|"main": "./dist/index.js",|"module": "./dist/prod/index.js","main": "./dist/prod/index.js",|g' {} \\;`;
+await $`find ./packages -name 'package.json' -exec sed -i '' 's|"import": "./dist/index.js"|"import": "./dist/prod/index.js"|g' {} \\;`;
 
 // in experiment
-await $`cd ${EXPERIMENT_DIR} && find ./packages -name 'package.json' -exec sed -i '' 's|"main": "index.ts",|"main": "./dist/prod/index.js","module": "./dist/prod/index.js",|g' {} \\;`;
-await $`cd ${EXPERIMENT_DIR} && find ./packages -name 'package.json' -exec sed -i '' 's|"main": "./dist/index.js",|"main": "./dist/prod/index.js","module": "./dist/prod/index.js",|g' {} \\;`;
-await $`cd ${EXPERIMENT_DIR} && find ./packages -name 'package.json' -exec sed -i '' 's|"import": "./dist/index.js"|"import": "./dist/prod/index.js"|g' {} \\;`;
+cd(EXPERIMENT_DIR);
+await $`find ./packages -name 'package.json' -exec sed -i '' 's|"main": "index.ts",|"main": "./dist/prod/index.js","module": "./dist/prod/index.js",|g' {} \\;`;
+await $`find ./packages -name 'package.json' -exec sed -i '' 's|"main": "./dist/index.js",|"main": "./dist/prod/index.js","module": "./dist/prod/index.js",|g' {} \\;`;
+await $`find ./packages -name 'package.json' -exec sed -i '' 's|"import": "./dist/index.js"|"import": "./dist/prod/index.js"|g' {} \\;`;
 
 // build control and experiment
-await Promise.all([
-  $`cd ${CONTROL_BENCH_DIR} && pnpm vite build`,
-  $`cd ${EXPERIMENT_BENCH_DIR} && pnpm vite build`,
-]).catch((e) => {
-  console.log({
-    upstreamUrlStr,
-    originUrlStr,
-    EXPERIMENT_DIR,
-    CONTROL_DIR,
-  });
-  throw e;
+cd(CONTROL_BENCH_DIR);
+await $`pnpm vite build`,
+
+cd(EXPERIMENT_BENCH_DIR);
+await $`pnpm vite build`,
+
+console.log({
+  upstreamUrlStr,
+  originUrlStr,
+  EXPERIMENT_DIR,
+  CONTROL_DIR,
 });
 
 // start build assets
@@ -122,6 +126,7 @@ await new Promise((resolve) => {
   setTimeout(resolve, 5000);
 });
 
+cd(pwd);
 await $`./node_modules/.bin/tracerbench compare --fidelity ${fidelity} --markers ${markers} --controlURL ${CONTROL_URL} --experimentURL ${EXPERIMENT_URL} --report --headless --cpuThrottleRate ${throttleRate}`;
 
 process.exit(0);