From c238d951cb9b9c21ab93c4586d146e0471fa71d4 Mon Sep 17 00:00:00 2001 From: Edmund Hung Date: Thu, 19 Sep 2024 13:47:37 +0100 Subject: [PATCH 1/2] chore: stop ci test from running vitest in watch mode --- packages/workers-shared/package.json | 2 +- packages/workers.new/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/workers-shared/package.json b/packages/workers-shared/package.json index 31e4b8d888e8..e815ae668d92 100644 --- a/packages/workers-shared/package.json +++ b/packages/workers-shared/package.json @@ -37,7 +37,7 @@ "deploy:router-worker": "CLOUDFLARE_API_TOKEN=$WORKERS_DEPLOY_AND_CONFIG_CLOUDFLARE_API_TOKEN pnpx wrangler versions upload --experimental-versions -c router-worker/wrangler.toml", "dev": "pnpm run clean && concurrently -n bundle:asset-worker,bundle:router-worker -c blue,magenta \"pnpm run bundle:asset-worker --watch\" \"pnpm run bundle:router-worker --watch\"", "test": "vitest", - "test:ci": "pnpm run test", + "test:ci": "vitest run", "types:emit": "tsc index.ts --declaration --emitDeclarationOnly --declarationDir ./dist" }, "dependencies": { diff --git a/packages/workers.new/package.json b/packages/workers.new/package.json index a8fdf5124190..f25d21956a6c 100644 --- a/packages/workers.new/package.json +++ b/packages/workers.new/package.json @@ -7,7 +7,7 @@ "deploy": "CLOUDFLARE_ACCOUNT_ID=$WORKERS_NEW_CLOUDFLARE_ACCOUNT_ID CLOUDFLARE_API_TOKEN=$WORKERS_NEW_CLOUDFLARE_API_TOKEN wrangler deploy", "dev": "wrangler dev", "test": "vitest -c tests/vitest.config.mts", - "test:ci": "vitest -c tests/vitest.config.mts" + "test:ci": "vitest run -c tests/vitest.config.mts" }, "devDependencies": { "@cloudflare/vitest-pool-workers": "workspace:*", From 821dc17320cab556f323b92642b84ed95e22c211 Mon Sep 17 00:00:00 2001 From: Edmund Hung Date: Thu, 19 Sep 2024 13:57:13 +0100 Subject: [PATCH 2/2] chore: reduce test job timeout time to 30mins --- .github/workflows/test-and-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-check.yml b/.github/workflows/test-and-check.yml index 6c60ef235710..23ae72dcd353 100644 --- a/.github/workflows/test-and-check.yml +++ b/.github/workflows/test-and-check.yml @@ -90,7 +90,7 @@ jobs: run: node -r esbuild-register tools/deployments/validate-changesets.ts test: - timeout-minutes: 60 + timeout-minutes: 30 concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.filter }}-test cancel-in-progress: true