From 30958d3a0b5d3a0e585b89bb15539a1f1e974d2b Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 19:26:09 +0000 Subject: [PATCH 01/12] Pack miniflare for e2e --- .github/workflows/e2e.yml | 29 +++++++++++++++++------------ packages/wrangler/package.json | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 5e84c1893c4b..bab9d84dd522 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -52,7 +52,23 @@ jobs: NODE_ENV: "production" CI_OS: ${{ runner.os }} - - name: Build Wrangler package for npm + - name: Pack Miniflare + run: pnpm pack --pack-destination $HOME + env: + NODE_ENV: "production" + working-directory: packages/miniflare + + - name: Find Miniflare + shell: bash + id: "find-miniflare" + run: echo "dir=$(ls $HOME/miniflare-*.tgz)" >> $GITHUB_OUTPUT; + + - name: Modify wrangler package.json miniflare dependency + run: cat <<< $(jq --tab ".dependencies.miniflare = \"$MINIFLARE_VERSION\"" packages/wrangler/package.json) > packages/wrangler/package.json + env: + MINIFLARE_VERSION: ${{ steps.find-miniflare.outputs.dir }} + + - name: Pack Wrangler run: pnpm pack --pack-destination $HOME env: NODE_ENV: "production" @@ -62,8 +78,6 @@ jobs: shell: bash id: "find-wrangler" run: echo "dir=$(ls $HOME/wrangler-*.tgz)" >> $GITHUB_OUTPUT; - env: - NODE_ENV: "production" - name: Run tests id: e2e-1 @@ -74,12 +88,3 @@ jobs: CLOUDFLARE_ACCOUNT_ID: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }} WRANGLER: pnpm --silent --package ${{ steps.find-wrangler.outputs.dir}} dlx wrangler NODE_OPTIONS: "--max_old_space_size=8192" - - - name: Retry tests - if: steps.e2e-1.outcome == 'failure' - run: pnpm run --filter wrangler test:e2e - env: - CLOUDFLARE_API_TOKEN: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }} - WRANGLER: pnpm --silent --package ${{ steps.find-wrangler.outputs.dir}} dlx wrangler - NODE_OPTIONS: "--max_old_space_size=8192" diff --git a/packages/wrangler/package.json b/packages/wrangler/package.json index b370e166f847..939a266a1d21 100644 --- a/packages/wrangler/package.json +++ b/packages/wrangler/package.json @@ -63,7 +63,7 @@ "test": "pnpm run assert-git-version && jest", "test:ci": "pnpm run test --coverage", "test:debug": "pnpm run test --silent=false --verbose=true", - "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e run", + "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e --retry 2 run", "test:watch": "pnpm run test --runInBand --testTimeout=50000 --watch", "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json" }, From 90e704ebe27359cb62c306b60db5d21a90f7eb25 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 19:32:47 +0000 Subject: [PATCH 02/12] Support windows --- .github/workflows/e2e.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index bab9d84dd522..2d9f739e61ab 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -64,9 +64,8 @@ jobs: run: echo "dir=$(ls $HOME/miniflare-*.tgz)" >> $GITHUB_OUTPUT; - name: Modify wrangler package.json miniflare dependency - run: cat <<< $(jq --tab ".dependencies.miniflare = \"$MINIFLARE_VERSION\"" packages/wrangler/package.json) > packages/wrangler/package.json - env: - MINIFLARE_VERSION: ${{ steps.find-miniflare.outputs.dir }} + run: pnpm add ${{ steps.find-miniflare.outputs.dir }} + working-directory: packages/wrangler - name: Pack Wrangler run: pnpm pack --pack-destination $HOME From b777a538954ee33fc45ff28f6017c252c7e459aa Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 19:36:45 +0000 Subject: [PATCH 03/12] windows? --- .github/workflows/e2e.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 2d9f739e61ab..ade70bd53a26 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -64,8 +64,10 @@ jobs: run: echo "dir=$(ls $HOME/miniflare-*.tgz)" >> $GITHUB_OUTPUT; - name: Modify wrangler package.json miniflare dependency - run: pnpm add ${{ steps.find-miniflare.outputs.dir }} - working-directory: packages/wrangler + run: cat <<< $(jq --tab ".dependencies.miniflare = \"$MINIFLARE_VERSION\"" packages/wrangler/package.json) > packages/wrangler/package.json + env: + MINIFLARE_VERSION: ${{ steps.find-miniflare.outputs.dir }} + shell: bash - name: Pack Wrangler run: pnpm pack --pack-destination $HOME From abc637bbc82ab0cd1edd98a8843f05c3d8a8c81a Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 19:50:08 +0000 Subject: [PATCH 04/12] file protocol --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ade70bd53a26..88bef5ae230e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -64,7 +64,7 @@ jobs: run: echo "dir=$(ls $HOME/miniflare-*.tgz)" >> $GITHUB_OUTPUT; - name: Modify wrangler package.json miniflare dependency - run: cat <<< $(jq --tab ".dependencies.miniflare = \"$MINIFLARE_VERSION\"" packages/wrangler/package.json) > packages/wrangler/package.json + run: cat <<< $(jq --tab ".dependencies.miniflare = \"file:$MINIFLARE_VERSION\"" packages/wrangler/package.json) > packages/wrangler/package.json env: MINIFLARE_VERSION: ${{ steps.find-miniflare.outputs.dir }} shell: bash From 2bf5472615d7e4a805539c4307a8b88f29bea0ac Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 19:51:11 +0000 Subject: [PATCH 05/12] verbose --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 88bef5ae230e..57ca721b3451 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -87,5 +87,5 @@ jobs: env: CLOUDFLARE_API_TOKEN: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }} - WRANGLER: pnpm --silent --package ${{ steps.find-wrangler.outputs.dir}} dlx wrangler + WRANGLER: pnpm --package ${{ steps.find-wrangler.outputs.dir}} dlx wrangler NODE_OPTIONS: "--max_old_space_size=8192" From 2ac4cb981f176d1ac76edea72c3691f02537a9ed Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 19:53:18 +0000 Subject: [PATCH 06/12] more verbose --- packages/wrangler/e2e/deploy.test.ts | 2 +- packages/wrangler/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wrangler/e2e/deploy.test.ts b/packages/wrangler/e2e/deploy.test.ts index d6495139f62f..889f88b64383 100644 --- a/packages/wrangler/e2e/deploy.test.ts +++ b/packages/wrangler/e2e/deploy.test.ts @@ -38,7 +38,7 @@ describe("deploy", () => { it("init worker", async () => { const { stdout } = - await runInRoot`$ ${WRANGLER} init --yes --no-delegate-c3 ${workerName}`; + await runInRoot`$$ ${WRANGLER} init --yes --no-delegate-c3 ${workerName}`; expect(normalize(stdout)).toContain( "To publish your Worker to the Internet, run `npm run deploy`" diff --git a/packages/wrangler/package.json b/packages/wrangler/package.json index 939a266a1d21..2c1ccaefa71d 100644 --- a/packages/wrangler/package.json +++ b/packages/wrangler/package.json @@ -63,7 +63,7 @@ "test": "pnpm run assert-git-version && jest", "test:ci": "pnpm run test --coverage", "test:debug": "pnpm run test --silent=false --verbose=true", - "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e --retry 2 run", + "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e --retry 2 run -t \"deploy\"", "test:watch": "pnpm run test --runInBand --testTimeout=50000 --watch", "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json" }, From c410d68f2cbd796872ca15f1cd244509fcdc7653 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 19:59:38 +0000 Subject: [PATCH 07/12] add --- .github/workflows/e2e.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 57ca721b3451..146edb06eae4 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -64,10 +64,8 @@ jobs: run: echo "dir=$(ls $HOME/miniflare-*.tgz)" >> $GITHUB_OUTPUT; - name: Modify wrangler package.json miniflare dependency - run: cat <<< $(jq --tab ".dependencies.miniflare = \"file:$MINIFLARE_VERSION\"" packages/wrangler/package.json) > packages/wrangler/package.json - env: - MINIFLARE_VERSION: ${{ steps.find-miniflare.outputs.dir }} - shell: bash + run: pnpm add ${{ steps.find-miniflare.outputs.dir }} + working-directory: packages/wrangler - name: Pack Wrangler run: pnpm pack --pack-destination $HOME From 399ae42499064338bff73d18d81cc4af9db198c2 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 20:20:20 +0000 Subject: [PATCH 08/12] windows? --- .github/workflows/e2e.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 146edb06eae4..05413a79be1f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -59,13 +59,20 @@ jobs: working-directory: packages/miniflare - name: Find Miniflare - shell: bash + if: matrix.os == 'windows-2022' + id: "find-miniflare" + run: echo "dir=$(ls $HOME/miniflare-*.tgz)" >> $Env:GITHUB_OUTPUT; + + - name: Find Miniflare + if: matrix.os != 'windows-2022' id: "find-miniflare" run: echo "dir=$(ls $HOME/miniflare-*.tgz)" >> $GITHUB_OUTPUT; - name: Modify wrangler package.json miniflare dependency - run: pnpm add ${{ steps.find-miniflare.outputs.dir }} - working-directory: packages/wrangler + run: cat <<< $(jq --tab ".dependencies.miniflare = \"file:$MINIFLARE_VERSION\"" packages/wrangler/package.json) > packages/wrangler/package.json + env: + MINIFLARE_VERSION: ${{ steps.find-miniflare.outputs.dir }} + shell: bash - name: Pack Wrangler run: pnpm pack --pack-destination $HOME From e62a5ddce51b56fe76f82bd9ee88bb819b9b944b Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 20:24:07 +0000 Subject: [PATCH 09/12] windows 2? --- .github/workflows/e2e.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 05413a79be1f..964870721d9c 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -58,21 +58,8 @@ jobs: NODE_ENV: "production" working-directory: packages/miniflare - - name: Find Miniflare - if: matrix.os == 'windows-2022' - id: "find-miniflare" - run: echo "dir=$(ls $HOME/miniflare-*.tgz)" >> $Env:GITHUB_OUTPUT; - - - name: Find Miniflare - if: matrix.os != 'windows-2022' - id: "find-miniflare" - run: echo "dir=$(ls $HOME/miniflare-*.tgz)" >> $GITHUB_OUTPUT; - - name: Modify wrangler package.json miniflare dependency - run: cat <<< $(jq --tab ".dependencies.miniflare = \"file:$MINIFLARE_VERSION\"" packages/wrangler/package.json) > packages/wrangler/package.json - env: - MINIFLARE_VERSION: ${{ steps.find-miniflare.outputs.dir }} - shell: bash + run: pnpm add $(ls $HOME/miniflare-*.tgz) - name: Pack Wrangler run: pnpm pack --pack-destination $HOME From 1eb451b8f53a573aea3a5e438b833926a00c0ead Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 20:27:24 +0000 Subject: [PATCH 10/12] windows 3 --- .github/workflows/e2e.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 964870721d9c..ea171dbf7d19 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -60,6 +60,7 @@ jobs: - name: Modify wrangler package.json miniflare dependency run: pnpm add $(ls $HOME/miniflare-*.tgz) + working-directory: packages/wrangler - name: Pack Wrangler run: pnpm pack --pack-destination $HOME From 4869bc2e7c0d574601e7223363dd4356899866f1 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 20:35:32 +0000 Subject: [PATCH 11/12] all tests --- .github/workflows/e2e.yml | 2 +- packages/wrangler/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ea171dbf7d19..7aac41bfa2ef 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -80,5 +80,5 @@ jobs: env: CLOUDFLARE_API_TOKEN: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }} - WRANGLER: pnpm --package ${{ steps.find-wrangler.outputs.dir}} dlx wrangler + WRANGLER: pnpm --silent --package ${{ steps.find-wrangler.outputs.dir}} dlx wrangler NODE_OPTIONS: "--max_old_space_size=8192" diff --git a/packages/wrangler/package.json b/packages/wrangler/package.json index 2c1ccaefa71d..939a266a1d21 100644 --- a/packages/wrangler/package.json +++ b/packages/wrangler/package.json @@ -63,7 +63,7 @@ "test": "pnpm run assert-git-version && jest", "test:ci": "pnpm run test --coverage", "test:debug": "pnpm run test --silent=false --verbose=true", - "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e --retry 2 run -t \"deploy\"", + "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e --retry 2 run", "test:watch": "pnpm run test --runInBand --testTimeout=50000 --watch", "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json" }, From 71243508c21e0b4dc17dc80b2d7dc6f3ba3eb63d Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 16 Nov 2023 20:37:09 +0000 Subject: [PATCH 12/12] remove output --- packages/wrangler/e2e/deploy.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wrangler/e2e/deploy.test.ts b/packages/wrangler/e2e/deploy.test.ts index 889f88b64383..d6495139f62f 100644 --- a/packages/wrangler/e2e/deploy.test.ts +++ b/packages/wrangler/e2e/deploy.test.ts @@ -38,7 +38,7 @@ describe("deploy", () => { it("init worker", async () => { const { stdout } = - await runInRoot`$$ ${WRANGLER} init --yes --no-delegate-c3 ${workerName}`; + await runInRoot`$ ${WRANGLER} init --yes --no-delegate-c3 ${workerName}`; expect(normalize(stdout)).toContain( "To publish your Worker to the Internet, run `npm run deploy`"