move webkit out of matrix

facebook · May 5, 2024 · d300110 · d300110
1 parent 246aff2
commit d300110
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -11,9 +11,9 @@ on:
       prod: {required: false, type: boolean}
 
 jobs:
-  e2e:
+  e2e-tests:
     runs-on: ${{ inputs.os }}
-    if: inputs.browser != 'webkit' || inputs.os == 'macos-latest'
+    if: (inputs.browser != 'webkit' || inputs.os == 'macos-latest') && (inputs.editor-mode != 'rich-text-with-collab' || inputs.events-mode != 'legacy-events')
     env:
       CI: true
       E2E_EDITOR_MODE: ${{ inputs.editor-mode }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -82,7 +82,7 @@ jobs:
       matrix:
         os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
         node-version: [18.18.0]
-        browser: ['chromium', 'firefox', 'webkit']
+        browser: ['chromium', 'firefox']
         editor-mode: ['rich-text', 'plain-text']
         events-mode: ['legacy-events', 'modern-events']
     uses: ./.github/workflows/e2e-test.yml
@@ -93,13 +93,36 @@ jobs:
       editor-mode: ${{ matrix.editor-mode }}
       events-mode: ${{ matrix.events-mode }}
 
+  e2e-webkit:
+    if: github.repository_owner == 'facebook'
+    strategy:
+      matrix:
+        os: ['macos-latest']
+        node-version: [18.18.0]
+        browser: ['webkit']
+        editor-mode: ['rich-text', 'plain-text', 'rich-text-with-collab']
+        events-mode: ['legacy-events', 'modern-events']
+        exclude:
+          - os: macos-latest
+            node-version: 18.18.0
+            browser: webkit
+            editor-mode: rich-text-with-collab
+            events-mode: legacy-events
+    uses: ./.github/workflows/e2e-test.yml
+    with:
+      os: ${{ matrix.os }}
+      node-version: ${{ matrix.node-version }}
+      browser: ${{ matrix.browser }}
+      editor-mode: ${{ matrix.editor-mode }}
+      events-mode: ${{ matrix.events-mode }}
+
   e2e-collab:
     if: github.repository_owner == 'facebook'
     strategy:
       matrix:
         os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
         node-version: [18.18.0]
-        browser: ['chromium', 'firefox', 'webkit']
+        browser: ['chromium', 'firefox']
         editor-mode: ['rich-text-with-collab']
         events-mode: ['modern-events']
     uses: ./.github/workflows/e2e-test.yml