From 59a848bc06233a4d9829d0092e4e11d8323561e3 Mon Sep 17 00:00:00 2001
From: Vu Nguyen <shardphoneix@gmail.com>
Date: Sun, 7 Jan 2024 11:19:25 -0800
Subject: [PATCH] chore: improve playwright ci caching

---
 .github/workflows/ci.yml         |  3 +--
 .github/workflows/playwright.yml | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76cd2824..bb0af671 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,11 +10,10 @@ on:
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+  DATABASE_URL: ${{ secrets.DATABASE_PREVIEW_URL }}
 
 jobs:
   build-lint:
-    env:
-      DATABASE_URL: file:./db.sqlite
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 23e07ecb..7fe1a858 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -8,10 +8,10 @@ on:
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-  DATABASE_URL: ${{ secrets.DATABASE_PREVIEW_URL }}
 jobs:
   test-e2e:
     env:
+      DATABASE_URL: ${{ secrets.DATABASE_PREVIEW_URL }}
       NEXTAUTH_URL: http://localhost:3000
       NEXTAUTH_SECRET: supersecret
       DISCORD_CLIENT_ID: STUBBED_ID
@@ -45,9 +45,6 @@ jobs:
       - name: Install deps (with cache)
         run: pnpm install --frozen-lockfile
 
-      - name: Install Playwright Browsers
-        run: pnpm exec playwright install --with-deps
-
       - name: Cache turbo build setup
         uses: actions/cache@v3
         with:
@@ -56,6 +53,20 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-turbo-
 
+      - name: turbo build
+        run: pnpm turbo run build --cache-dir=.turbo
+
+      - uses: actions/cache@v3
+        id: playwright-cache3
+        with:
+          path: |
+            ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ hashFiles('**/pnpm-lock.yaml') }}
+      - run: pnpm exec playwright install --with-deps
+        if: steps.playwright-cache3.outputs.cache-hit != 'true'
+      - run: pnpm exec playwright install-deps
+        if: steps.playwright-cache3.outputs.cache-hit == 'true'
+
       - name: Run Playwright tests
         run: pnpm turbo run e2e --cache-dir=.turbo