👷 (e2e) testing !turbo on lhci, test:e2e [b]

Moved the installs higher, but I think this was misleading as the website as not getting rebuilt at all in this, it was the prior cache that was coming through and then `lhci` and `test:e2e` respctively were _not_ cached correctly. But see if this speeds things up at all. Ideally we put `turbo` back.
JeromeFitz · Jul 10, 2023 · 143329e · 143329e
1 parent d01f670
commit 143329e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml
@@ -44,6 +44,26 @@ runs:
           ~/.cache/ms-playwright
         key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
 
+    - name: '🎭  Playwright: Install (!cache)'
+      id: e2e-dependencies-playwright
+      shell: bash
+      # run: pnpm playwright install --with-deps
+      run: npx install playwright --with-deps
+      if: steps.playwright-cache.outputs.cache-hit != 'true'
+
+    - name: '🎭  Playwright: Install (cache)'
+      id: e2e-dependencies-playwright-cache
+      shell: bash
+      # run: pnpm playwright install-deps
+      run: npx playwright install-deps
+      if: steps.playwright-cache.outputs.cache-hit == 'true'
+
+    - name: '💡  Lighthouse: Install'
+      id: e2e-dependencies-lighthouse
+      shell: bash
+      # run: pnpm add @lhci/cli -g
+      run: npx install @lhci/cli -g
+
     # @todo(gh-actions) Separate `main` from PR
     - name: '🧪  Test: Build'
       id: e2e-build
@@ -69,12 +89,6 @@ runs:
     #     restore-keys: |
     #       ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-
 
-    - name: '💡  Lighthouse: Install'
-      id: e2e-dependencies-lighthouse
-      shell: bash
-      # run: pnpm add @lhci/cli -g
-      run: npx install @lhci/cli -g
-
     - name: '💡  Lighthouse: ${{ inputs.WEBSITE }}'
       id: test-lighthouse
       shell: bash
@@ -83,22 +97,9 @@ runs:
         TURBO_TEAM: ${{ inputs.TURBO_TEAM }}
         TURBO_TOKEN: ${{ inputs.TURBO_TOKEN }}
         VERCEL_ENV: ${{ inputs.VERCEL_ENV }}
+      # run:  pnpm turbo run lhci --filter="${{ inputs.WEBSITE }}" --cache-dir=".cache-turbo"
       run: |
-        pnpm turbo run lhci --filter="${{ inputs.WEBSITE }}" --cache-dir=".cache-turbo"
-
-    - name: '🎭  Playwright: Install (!cache)'
-      id: e2e-dependencies-playwright
-      shell: bash
-      # run: pnpm playwright install --with-deps
-      run: npx install playwright --with-deps
-      if: steps.playwright-cache.outputs.cache-hit != 'true'
-
-    - name: '🎭  Playwright: Install (cache)'
-      id: e2e-dependencies-playwright-cache
-      shell: bash
-      # run: pnpm playwright install-deps
-      run: npx playwright install-deps
-      if: steps.playwright-cache.outputs.cache-hit == 'true'
+        pnpm --filter "${{ inputs.WEBSITE }}" lhci
 
     - name: '🎭  Playwright: ${{ inputs.WEBSITE }}'
       id: e2e-test
@@ -107,7 +108,9 @@ runs:
         TURBO_TEAM: ${{ inputs.TURBO_TEAM }}
         TURBO_TOKEN: ${{ inputs.TURBO_TOKEN }}
         VERCEL_ENV: ${{ inputs.VERCEL_ENV }}
-      run: pnpm turbo run test:e2e --filter="${{ inputs.WEBSITE }}" --cache-dir=".cache-turbo"
+      # run: pnpm turbo run test:e2e --filter="${{ inputs.WEBSITE }}" --cache-dir=".cache-turbo"
+      run: |
+        pnpm --filter "${{ inputs.WEBSITE }}" test:e2e
 
     # - name: '🎭  Playwright: Upload'
     #   id: e2e-upload

diff --git a/package.json b/package.json
@@ -26,8 +26,7 @@
     "prepare": "is-ci || husky install",
     "semantic-release": "pnpm run semantic-release:mono",
     "semantic-release:dry": "pnpm --filter jeromefitzgerald.com -r --workspace-concurrency=1 exec -- npx --no-install semantic-release -e semantic-release-monorepo --dry-run",
-    "semantic-release:mono": "pnpm --filter jeromefitzgerald.com -r --workspace-concurrency=1 exec -- npx --no-install semantic-release -e semantic-release-monorepo",
-    "start": "pnpm turbo run start --filter=\"jeromefitzgerald.com\""
+    "semantic-release:mono": "pnpm --filter jeromefitzgerald.com -r --workspace-concurrency=1 exec -- npx --no-install semantic-release -e semantic-release-monorepo"
   },
   "dependencies": {
     "@jeromefitz/conventional-gitmoji": "3.3.6",

diff --git a/packages/playwright-config/playwright.config.js b/packages/playwright-config/playwright.config.js
@@ -20,9 +20,7 @@ const config = ({ basePath = '', port, website = 'jeromefitzgerald.com' }) => {
     },
 
     webServer: {
-      // command: `cd ../.. && pnpm turbo run dev --filter="${website}"`,
-      // command: 'pnpm run dev',
-      command: 'pnpm run start',
+      command: `pnpm --filter ${website} start`,
       url: baseURL,
       reuseExistingServer: !process.env.CI,
     },

diff --git a/turbo.json b/turbo.json
@@ -71,7 +71,7 @@
       "outputs": ["storybook-static/**"]
     },
     "test:e2e": {
-      "dependsOn": ["^build", "jeromefitzgerald.com#build"],
+      "dependsOn": ["^build", "^jeromefitzgerald.com#build"],
       "inputs": ["src/e2e/**"],
       "outputs": ["e2e-report/**", "e2e-results/**"]
     },