adjust if in publish

WycliffeAssociates · Nov 20, 2024 · ad8a296 · ad8a296
1 parent 115033d
commit ad8a296
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 67 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,8 +17,6 @@ concurrency:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    env: 
-      SHOULD_RUN_E2E_TESTS: ${{ github.event_name != 'workflow_dispatch' || github.ref == 'refs/heads/prod' }}
     permissions:
       contents: read
       deployments: write
@@ -100,14 +98,14 @@ jobs:
       - name: Copy in cf dev vars if testing
         run: |
           printf "%s\n" "$CF_DEV_VARS" > .dev.vars
-        if: env.SHOULD_RUN_E2E_TESTS
+        if: github.event_name != 'workflow_dispatch' || github.ref == 'refs/heads/prod'
       - name: Install Playwright Browsers
         run: pnpm exec playwright install --with-deps
         # Can skip them if dispatching manually on any branch but prod
-        if: env.SHOULD_RUN_E2E_TESTS
+        if: github.event_name != 'workflow_dispatch' || github.ref == 'refs/heads/prod'
       - name: Run Playwright tests
         run: pnpm exec playwright test
-        if: env.SHOULD_RUN_E2E_TESTS
+        if: github.event_name != 'workflow_dispatch' || github.ref == 'refs/heads/prod'
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:

diff --git a/playwright.config.ts b/playwright.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig, devices } from "@playwright/test";
+import {defineConfig, devices} from "@playwright/test";
 
 /**
  * Read environment variables from file.
@@ -12,73 +12,73 @@ import { defineConfig, devices } from "@playwright/test";
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-	testDir: "./tests",
-	/* Run tests in files in parallel */
-	fullyParallel: true,
-	/* Fail the build on CI if you accidentally left test.only in the source code. */
-	forbidOnly: !!process.env.CI,
-	/* Retry on CI only */
-	retries: process.env.CI ? 2 : 0,
-	/* Opt out of parallel tests on CI. */
-	workers: process.env.CI ? 1 : undefined,
-	/* Reporter to use. See https://playwright.dev/docs/test-reporters */
-	reporter: "html",
-	timeout: process.env.CI ? 20_000 : 40_000, //15 seconds
-	expect: {
-		timeout: process.env.CI ? 5000 : 10000,
-	},
+  testDir: "./tests",
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: "html",
+  timeout: process.env.CI ? 20_000 : 40_000, //15 seconds
+  expect: {
+    timeout: process.env.CI ? 5000 : 10000,
+  },
 
-	/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-	use: {
-		/* Base URL to use in actions like `await page.goto('/')`. */
-		baseURL: process.env.CI ? "http://localhost:8788" : "http://localhost:4321",
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    baseURL: process.env.CI ? "http://localhost:8788" : "http://localhost:4321",
 
-		/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-		trace: "on-first-retry",
-	},
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: "on-first-retry",
+  },
 
-	/* Configure projects for major browsers */
-	projects: [
-		{
-			name: "chromium",
-			use: { ...devices["Desktop Chrome"] },
-		},
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: "chromium",
+      use: {...devices["Desktop Chrome"]},
+    },
 
-		{
-			name: "firefox",
-			use: { ...devices["Desktop Firefox"] },
-		},
+    {
+      name: "firefox",
+      use: {...devices["Desktop Firefox"]},
+    },
 
-		{
-			name: "webkit",
-			use: { ...devices["Desktop Safari"] },
-		},
+    {
+      name: "webkit",
+      use: {...devices["Desktop Safari"]},
+    },
 
-		/* Test against mobile viewports. */
-		// {
-		//   name: 'Mobile Chrome',
-		//   use: { ...devices['Pixel 5'] },
-		// },
-		// {
-		//   name: 'Mobile Safari',
-		//   use: { ...devices['iPhone 12'] },
-		// },
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
 
-		/* Test against branded browsers. */
-		// {
-		//   name: 'Microsoft Edge',
-		//   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-		// },
-		// {
-		//   name: 'Google Chrome',
-		//   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-		// },
-	],
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
 
-	/* Run your local dev server before starting the tests */
-	webServer: {
-		command: process.env.CI ? "pnpm run cfPreview" : "pnpm run dev",
-		url: process.env.CI ? "http://localhost:8788" : "http://localhost:4321",
-		reuseExistingServer: !process.env.CI,
-	},
+  /* Run your local dev server before starting the tests */
+  webServer: {
+    command: process.env.CI ? "pnpm run cfPreview" : "pnpm run dev",
+    url: process.env.CI ? "http://localhost:8788" : "http://localhost:4321",
+    reuseExistingServer: !process.env.CI,
+  },
 });