From 567e46ab8baae69c12c0b935d4a1be1f180c044a Mon Sep 17 00:00:00 2001 From: sahejkm Date: Sat, 27 Jul 2024 09:36:48 +0800 Subject: [PATCH 1/2] [Lexica][CI] run extended tests for safari in mac-os and chrome/firefox in linux/windows --- .github/workflows/call-e2e-all-tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/call-e2e-all-tests.yml b/.github/workflows/call-e2e-all-tests.yml index 27dfb597a80..624e9aa19cc 100644 --- a/.github/workflows/call-e2e-all-tests.yml +++ b/.github/workflows/call-e2e-all-tests.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: node-version: [18.18.0] - browser: ['chromium', 'firefox', 'webkit'] + browser: ['webkit'] editor-mode: ['rich-text', 'plain-text'] events-mode: ['modern-events'] uses: ./.github/workflows/call-e2e-test.yml @@ -56,7 +56,7 @@ jobs: strategy: matrix: node-version: [18.18.0] - browser: ['chromium', 'firefox', 'webkit'] + browser: ['webkit'] uses: ./.github/workflows/call-e2e-test.yml with: os: 'macos-latest' @@ -94,7 +94,7 @@ jobs: prod: strategy: matrix: - os: ['macos-latest'] + os: ['ubuntu-latest'] node-version: [18.18.0] browser: ['chromium'] editor-mode: ['rich-text'] @@ -111,7 +111,7 @@ jobs: collab-prod: strategy: matrix: - os: ['macos-latest'] + os: ['ubuntu-latest'] node-version: [18.18.0] browser: ['chromium'] editor-mode: ['rich-text-with-collab'] @@ -134,7 +134,7 @@ jobs: prod: [false] uses: ./.github/workflows/call-e2e-test.yml with: - os: 'macos-latest' + os: 'ubuntu-latest' browser: 'chromium' node-version: 18.18.0 events-mode: 'modern-events' @@ -151,7 +151,7 @@ jobs: events-mode: ['modern-events'] uses: ./.github/workflows/call-e2e-test.yml with: - os: 'macos-latest' + os: 'ubuntu-latest' flaky: true node-version: ${{ matrix.node-version }} browser: ${{ matrix.browser }} From dd010db1af6725b8ccf358fa30bd53a3bfcd4fd2 Mon Sep 17 00:00:00 2001 From: sahejkm Date: Mon, 29 Jul 2024 10:01:08 +0800 Subject: [PATCH 2/2] Run rich-text tests on all browsers on mac still --- .github/workflows/call-e2e-all-tests.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/call-e2e-all-tests.yml b/.github/workflows/call-e2e-all-tests.yml index 624e9aa19cc..3bb173e122d 100644 --- a/.github/workflows/call-e2e-all-tests.yml +++ b/.github/workflows/call-e2e-all-tests.yml @@ -4,12 +4,27 @@ on: workflow_call: jobs: - mac: + mac-rich: + strategy: + matrix: + node-version: [18.18.0] + browser: ['webkit', 'chromium', 'firefox'] + editor-mode: ['rich-text'] + events-mode: ['modern-events'] + uses: ./.github/workflows/call-e2e-test.yml + with: + os: 'macos-latest' + node-version: ${{ matrix.node-version }} + browser: ${{ matrix.browser }} + editor-mode: ${{ matrix.editor-mode }} + events-mode: ${{ matrix.events-mode }} + + mac-plain: strategy: matrix: node-version: [18.18.0] browser: ['webkit'] - editor-mode: ['rich-text', 'plain-text'] + editor-mode: ['plain-text'] events-mode: ['modern-events'] uses: ./.github/workflows/call-e2e-test.yml with: