From 9612078a4da3b4abed0f398cfe60322e878c7b26 Mon Sep 17 00:00:00 2001
From: Jonathan Johnson <jon.johnson@ucsf.edu>
Date: Tue, 6 Feb 2024 08:25:40 -0800
Subject: [PATCH] Matrix run percy tests

---
 .github/workflows/percy-test-pr.yml | 13 +++++++------
 .github/workflows/percy.yml         |  8 +++++++-
 packages/frontend/package.json      |  1 -
 packages/test-app/package.json      |  1 -
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/percy-test-pr.yml b/.github/workflows/percy-test-pr.yml
index 808fffab85..a5e637ac55 100644
--- a/.github/workflows/percy-test-pr.yml
+++ b/.github/workflows/percy-test-pr.yml
@@ -20,6 +20,12 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'run percy tests')
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        workspace:
+          - frontend
+          - test-app
     steps:
       - uses: actions/checkout@v4
         with:
@@ -33,9 +39,4 @@ jobs:
           cache: pnpm
       - run: pnpm install
       - name: Run Percy Tests
-        run: pnpm run --workspace-concurrency=1 -r test:percy
-      - uses: act10ns/slack@v2
-        if: failure()
-        with:
-          status: ${{ job.status }}
-          message: Percy Run Failed {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
+        run: pnpm --filter ${{matrix.workspace}} exec percy exec -- ember test
diff --git a/.github/workflows/percy.yml b/.github/workflows/percy.yml
index 01facd1bc1..059d787638 100644
--- a/.github/workflows/percy.yml
+++ b/.github/workflows/percy.yml
@@ -20,6 +20,12 @@ jobs:
     name: Test and Capture Screenshots
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        workspace:
+          - frontend
+          - test-app
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v2
@@ -31,7 +37,7 @@ jobs:
           cache: pnpm
       - run: pnpm install
       - name: Run Percy Tests
-        run: pnpm run --workspace-concurrency=1 -r test:percy
+        run: pnpm --filter ${{matrix.workspace}} exec percy exec -- ember test
       - uses: act10ns/slack@v2
         if: failure()
         with:
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 29e9cbca16..f1f49bce4b 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -11,7 +11,6 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "percy:test": "percy exec -- pnpm run test:ember",
     "deploy:production": "ember deploy production --activate",
     "deploy:staging": "ember deploy staging --activate",
     "deploy:test": "ember deploy development",
diff --git a/packages/test-app/package.json b/packages/test-app/package.json
index 0f171d5fb8..4bf9bb6248 100644
--- a/packages/test-app/package.json
+++ b/packages/test-app/package.json
@@ -12,7 +12,6 @@
     "build": "ember build --environment=production",
     "start": "ember serve",
     "test:ember": "ember test",
-    "test:percy": "percy exec -- pnpm run test:ember",
     "tryone": "ember try:one"
   },
   "devDependencies": {