From 5d334568429984457279bd3bf36b0b3767ebb255 Mon Sep 17 00:00:00 2001 From: emily-shen <69125074+emily-shen@users.noreply.github.com> Date: Wed, 26 Feb 2025 13:40:02 +0000 Subject: [PATCH 1/3] switch api token and account id --- .github/workflows/c3-e2e-quarantine.yml | 4 ++-- .github/workflows/c3-e2e.yml | 4 ++-- .github/workflows/e2e-project-cleanup.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/c3-e2e-quarantine.yml b/.github/workflows/c3-e2e-quarantine.yml index d182ed6ecbac..90602271def0 100644 --- a/.github/workflows/c3-e2e-quarantine.yml +++ b/.github/workflows/c3-e2e-quarantine.yml @@ -42,5 +42,5 @@ jobs: packageManager: ${{ matrix.pm.name}} packageManagerVersion: ${{ matrix.pm.version }} quarantine: true - accountId: ${{ secrets.C3_TEST_CLOUDFLARE_ACCOUNT_ID }} - apiToken: ${{ secrets.C3_TEST_CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }} + apiToken: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }} diff --git a/.github/workflows/c3-e2e.yml b/.github/workflows/c3-e2e.yml index 1103c4e5f3e6..f735afd6d1cf 100644 --- a/.github/workflows/c3-e2e.yml +++ b/.github/workflows/c3-e2e.yml @@ -81,5 +81,5 @@ jobs: packageManagerVersion: ${{ matrix.pm.version }} quarantine: false experimental: ${{ matrix.experimental }} - accountId: ${{ secrets.C3_TEST_CLOUDFLARE_ACCOUNT_ID }} - apiToken: ${{ secrets.C3_TEST_CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }} + apiToken: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }} diff --git a/.github/workflows/e2e-project-cleanup.yml b/.github/workflows/e2e-project-cleanup.yml index f199f4823fb1..c701a37d6f85 100644 --- a/.github/workflows/e2e-project-cleanup.yml +++ b/.github/workflows/e2e-project-cleanup.yml @@ -23,8 +23,8 @@ jobs: - name: Cleanup C3 E2E test projects run: node -r esbuild-register tools/e2e/e2eCleanup.ts env: - CLOUDFLARE_API_TOKEN: ${{ secrets.C3_TEST_CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.C3_TEST_CLOUDFLARE_ACCOUNT_ID }} + CLOUDFLARE_API_TOKEN: ${{ secrets.TEST_CLOUDFLARE_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.TEST_CLOUDFLARE_ACCOUNT_ID }} - name: Cleanup E2E test projects run: node -r esbuild-register tools/e2e/e2eCleanup.ts From aa63939bf64953a1f6cde0a142f7727119190e0f Mon Sep 17 00:00:00 2001 From: emily-shen <69125074+emily-shen@users.noreply.github.com> Date: Wed, 26 Feb 2025 13:54:13 +0000 Subject: [PATCH 2/3] add test to retrigger ci --- .../create-cloudflare/e2e-tests/cli.test.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/packages/create-cloudflare/e2e-tests/cli.test.ts b/packages/create-cloudflare/e2e-tests/cli.test.ts index 8da0a23ed488..53cc365993d3 100644 --- a/packages/create-cloudflare/e2e-tests/cli.test.ts +++ b/packages/create-cloudflare/e2e-tests/cli.test.ts @@ -421,5 +421,22 @@ describe.skipIf(experimental || frameworkToTest || isQuarantineMode())( expect(output).toContain(`lang JavaScript`); }, ); + test({ experimental }).skipIf(process.platform === "win32")( + "--existing-script", + async ({ logStream, project }) => { + const { output } = await runC3( + [ + project.path, + "--existing-script=existing-script-test-do-not-delete", + "--git=false", + "--no-deploy", + ], + [], + logStream, + ); + expect(output).toContain("Pre-existing Worker (from Dashboard)"); + expect(output).toContain("Application created successfully!"); + }, + ); }, ); From 67063c09b73da83a6fb0b62cddca5b551f7c4630 Mon Sep 17 00:00:00 2001 From: emily-shen <69125074+emily-shen@users.noreply.github.com> Date: Wed, 26 Feb 2025 14:45:40 +0000 Subject: [PATCH 3/3] skip if yarn --- .../create-cloudflare/e2e-tests/cli.test.ts | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/create-cloudflare/e2e-tests/cli.test.ts b/packages/create-cloudflare/e2e-tests/cli.test.ts index 53cc365993d3..9af9bfa40966 100644 --- a/packages/create-cloudflare/e2e-tests/cli.test.ts +++ b/packages/create-cloudflare/e2e-tests/cli.test.ts @@ -1,5 +1,6 @@ import fs, { readFileSync } from "node:fs"; import { basename } from "node:path"; +import { detectPackageManager } from "helpers/packageManagers"; import { beforeAll, describe, expect } from "vitest"; import { version } from "../package.json"; import { getFrameworkToTest } from "./frameworkToTest"; @@ -14,7 +15,7 @@ import type { Suite } from "vitest"; const experimental = process.env.E2E_EXPERIMENTAL === "true"; const frameworkToTest = getFrameworkToTest({ experimental: false }); - +const { name: pm } = detectPackageManager(); // Note: skipIf(frameworkToTest) makes it so that all the basic C3 functionality // tests are skipped in case we are testing a specific framework describe.skipIf(experimental || frameworkToTest || isQuarantineMode())( @@ -421,22 +422,22 @@ describe.skipIf(experimental || frameworkToTest || isQuarantineMode())( expect(output).toContain(`lang JavaScript`); }, ); - test({ experimental }).skipIf(process.platform === "win32")( - "--existing-script", - async ({ logStream, project }) => { - const { output } = await runC3( - [ - project.path, - "--existing-script=existing-script-test-do-not-delete", - "--git=false", - "--no-deploy", - ], - [], - logStream, - ); - expect(output).toContain("Pre-existing Worker (from Dashboard)"); - expect(output).toContain("Application created successfully!"); - }, - ); + + test({ experimental }).skipIf( + process.platform === "win32" || pm === "yarn", + )("--existing-script", async ({ logStream, project }) => { + const { output } = await runC3( + [ + project.path, + "--existing-script=existing-script-test-do-not-delete", + "--git=false", + "--no-deploy", + ], + [], + logStream, + ); + expect(output).toContain("Pre-existing Worker (from Dashboard)"); + expect(output).toContain("Application created successfully!"); + }); }, );