From 97550539d294736c30e38ce92fb906bc9cd30638 Mon Sep 17 00:00:00 2001
From: Steve Ayers <sayers@buf.build>
Date: Mon, 17 Jun 2024 13:55:08 -0400
Subject: [PATCH] Browsers

Signed-off-by: Steve Ayers <sayers@buf.build>
---
 .github/workflows/conformance.yaml | 42 ++++++++++++++++++++++++++----
 Makefile                           | 12 +++++++--
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 9f09f3cb5..1b25de5ca 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -75,7 +75,7 @@ jobs:
             ${{ runner.os }}-connect-express-conformance-
       - name: testconnectexpressconformance
         run: make testconnectexpressconformance
-  web:
+  webchrome:
     runs-on: ubuntu-22.04
     steps:
       - name: checkout
@@ -86,8 +86,40 @@ jobs:
           path: |
             ~/.tmp
             .tmp
-          key: ${{ runner.os }}-connect-web-conformance-${{ hashFiles('Makefile') }}
+          key: ${{ runner.os }}-connect-web-chrome-conformance-${{ hashFiles('Makefile') }}
           restore-keys: |
-            ${{ runner.os }}-connect-web-conformance-
-      - name: testwebconformance
-        run: make testwebconformance
+            ${{ runner.os }}-connect-web-chrome-conformance-
+      - name: testwebchromeconformance
+        run: make testwebchromeconformance
+  webfirefox:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.tmp
+            .tmp
+          key: ${{ runner.os }}-connect-web-firefox-conformance-${{ hashFiles('Makefile') }}
+          restore-keys: |
+            ${{ runner.os }}-connect-web-firefox-conformance-
+      - name: testwebfirefoxconformance
+        run: make testwebfirefoxconformance
+  websafari:
+    runs-on: macos-11
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.tmp
+            .tmp
+          key: ${{ runner.os }}-connect-web-safari-conformance-${{ hashFiles('Makefile') }}
+          restore-keys: |
+            ${{ runner.os }}-connect-web-safari-conformance-
+      - name: testwebsafariconformance
+        run: make testwebsafariconformance
diff --git a/Makefile b/Makefile
index 948133f8f..d244b371f 100644
--- a/Makefile
+++ b/Makefile
@@ -210,10 +210,18 @@ testconnectfastifyconformance: $(BUILD)/connect-fastify
 	npm run -w packages/connect-fastify conformance
 
 .PHONY: testwebconformance
-testwebconformance: $(BUILD)/connect-web
+testwebconformance: testwebchromeconformance testwebfirefoxconformance testwebsafariconformance
+
+.PHONY: testwebchromeconformance
+testwebchromeconformance: $(BUILD)/connect-web
 	npm run -w packages/connect-web conformance:client:chrome
+
+.PHONY: testwebfirefoxconformance
+testwebfirefoxconformance: $(BUILD)/connect-web
 	npm run -w packages/connect-web conformance:client:firefox
-	npm run -w packages/connect-web conformance:client:node
+
+.PHONY: testwebsafariconformance
+testwebsafariconformance: $(BUILD)/connect-web
 	@# Requires one to enable the 'Allow Remote Automation' option in Safari's Develop menu.
 ifeq ($(NODE_OS),darwin)
 	npm run -w packages/connect-web conformance:client:safari