From 73241e5aad471e98f062f1e91d9e29071ece8233 Mon Sep 17 00:00:00 2001 From: larabr <7375870+larabr@users.noreply.github.com> Date: Wed, 12 Mar 2025 13:51:47 +0100 Subject: [PATCH] Revert "CI: do not test Webkit on Linux" This reverts commit 4762d2c7623eccaf297a2bf9f4c7aa957aa32c6f. Following release of support for X25519 in Webkit Linux. --- .github/workflows/tests.yml | 1 - test/web-test-runner.config.js | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8380ae50..f467f178 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -106,7 +106,6 @@ jobs: npx playwright install --with-deps firefox - name: Install WebKit # caching not possible, external shared libraries required - if: ${{ matrix.runner == 'macos-latest' }} # do not install on ubuntu, since the X25519 WebCrypto implementation has issues run: npx playwright install --with-deps webkit - name: Run browser tests diff --git a/test/web-test-runner.config.js b/test/web-test-runner.config.js index 5fc9c6b2..45e18856 100644 --- a/test/web-test-runner.config.js +++ b/test/web-test-runner.config.js @@ -1,10 +1,10 @@ -import { existsSync } from 'fs'; -import { playwrightLauncher, playwright } from '@web/test-runner-playwright'; +import { playwrightLauncher } from '@web/test-runner-playwright'; const sharedPlaywrightCIOptions = { // createBrowserContext: ({ browser }) => browser.newContext({ ignoreHTTPSErrors: true }), headless: true }; + export default { nodeResolve: true, // to resolve npm module imports in `unittests.html` files: './test/unittests.html', @@ -29,13 +29,11 @@ export default { ...sharedPlaywrightCIOptions, product: 'firefox' }), - // try setting up webkit, but ignore if not available - // (e.g. on ubuntu, where we don't want to test webkit as the WebCrypto X25519 implementation has issues) - existsSync(playwright.webkit.executablePath()) && playwrightLauncher({ + playwrightLauncher({ ...sharedPlaywrightCIOptions, product: 'webkit' }) - ].filter(Boolean) + ] } ] };