From 4bc6c0d883952b8fae1426933126b9747cb98bee Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Sun, 6 Oct 2024 13:37:05 +0100 Subject: [PATCH] try this --- package.json | 7 +++---- test-setup/common.ts | 4 ++-- test-setup/startAnvil.ts | 5 +---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index a6da13ae96..91bd09220e 100644 --- a/package.json +++ b/package.json @@ -25,10 +25,9 @@ "release:check": "changeset status --verbose --since=origin/main", "release:publish": "pnpm install && pnpm build && changeset publish", "release:version": "changeset version && pnpm install --lockfile-only && pnpm run changelog:generate", - "pretest": "ANVIL_PORT=8556 tsx test-setup/startAnvil.ts & wait-on tcp:8556", - "test": "pnpm run --recursive test", - "pretest:ci": "pnpm run pretest", - "test:ci": "pnpm run --recursive test:ci", + "test": "pnpm run test:start-anvil & wait-on tcp:8556 && pnpm run --recursive test", + "test:ci": "pnpm run test:start-anvil & wait-on tcp:8556 && pnpm run --recursive test:ci", + "test:start-anvil": "tsx test-setup/startAnvil.ts", "type-bench": "pnpm --filter ./test/ts-benchmarks bench", "type-stats-repo": "attest stats packages/*", "vercel:prepare": "(forge --version || pnpm foundryup) && ln -sf /vercel/.foundry/bin/* node_modules/.bin/ && forge --version" diff --git a/test-setup/common.ts b/test-setup/common.ts index d4d37cf6bc..5ca803fdfe 100644 --- a/test-setup/common.ts +++ b/test-setup/common.ts @@ -1,7 +1,7 @@ import { createTestClient, http } from "viem"; -export const anvilHost = process.env.ANVIL_HOST ?? "127.0.0.1"; -export const anvilPort = process.env.ANVIL_PORT ?? "8556"; +export const anvilHost = process.env.ANVIL_HOST || "127.0.0.1"; +export const anvilPort = Number(process.env.ANVIL_PORT) || 8556; // ID of the current test worker. Used by the `@viem/anvil` proxy server. export const poolId = Number(process.env.VITEST_POOL_ID ?? 1); diff --git a/test-setup/startAnvil.ts b/test-setup/startAnvil.ts index dcce6d2d33..c890b99cc5 100644 --- a/test-setup/startAnvil.ts +++ b/test-setup/startAnvil.ts @@ -13,10 +13,7 @@ await execa("pnpm", ["run", "build"], { }); console.log("starting anvil proxy"); -await startAnvilProxy({ - host: anvilHost, - port: Number(anvilPort), -}); +await startAnvilProxy({ host: anvilHost, port: anvilPort }); // ensure anvil dies process.on("SIGINT", () => process.exit());