From 0508347a5ffcdad7bbabc8baa224ed81bdbeda18 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Sat, 7 Sep 2024 09:07:53 +0200 Subject: [PATCH] feedback --- .github/workflows/tests_bidi.yml | 9 ++------- packages/playwright-core/src/server/registry/index.ts | 10 +++++----- tests/bidi/playwright.config.ts | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests_bidi.yml b/.github/workflows/tests_bidi.yml index 1c7a241fa3..433294dbea 100644 --- a/.github/workflows/tests_bidi.yml +++ b/.github/workflows/tests_bidi.yml @@ -8,6 +8,7 @@ on: paths: - .github/workflows/tests_bidi.yml schedule: + # Run every day at midnight - cron: '0 0 * * *' env: @@ -26,15 +27,9 @@ jobs: fail-fast: false matrix: # TODO: add Firefox - channel: [bidi-chrome-beta] + channel: [bidi-chrome-stable] steps: - uses: actions/checkout@v4 - - name: Install browser - run: | - if [[ ${{ matrix.channel }} == bidi-chrome-beta ]]; then - curl -O https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb - sudo dpkg -i google-chrome-beta_current_amd64.deb - fi - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/packages/playwright-core/src/server/registry/index.ts b/packages/playwright-core/src/server/registry/index.ts index 972e8bc985..058e0bcbc3 100644 --- a/packages/playwright-core/src/server/registry/index.ts +++ b/packages/playwright-core/src/server/registry/index.ts @@ -354,7 +354,7 @@ function readDescriptors(browsersJSON: BrowsersJSON) { export type BrowserName = 'chromium' | 'firefox' | 'webkit' | 'bidi'; type InternalTool = 'ffmpeg' | 'firefox-beta' | 'chromium-tip-of-tree' | 'android'; -type BidiChannel = 'bidi-firefox-stable' | 'bidi-chrome-canary' | 'bidi-chrome-beta'; +type BidiChannel = 'bidi-firefox-stable' | 'bidi-chrome-canary' | 'bidi-chrome-stable'; type ChromiumChannel = 'chrome' | 'chrome-beta' | 'chrome-dev' | 'chrome-canary' | 'msedge' | 'msedge-beta' | 'msedge-dev' | 'msedge-canary'; const allDownloadable = ['chromium', 'firefox', 'webkit', 'ffmpeg', 'firefox-beta', 'chromium-tip-of-tree']; @@ -530,10 +530,10 @@ export class Registry { 'darwin': '/Applications/Firefox.app/Contents/MacOS/firefox', 'win32': '\\Mozilla Firefox\\firefox.exe', })); - this._executables.push(this._createBidiChannel('bidi-chrome-beta', { - 'linux': '/opt/google/chrome-beta/chrome', - 'darwin': '/Applications/Google Chrome Beta.app/Contents/MacOS/Google Chrome Beta', - 'win32': `\\Google\\Chrome Beta\\Application\\chrome.exe`, + this._executables.push(this._createBidiChannel('bidi-chrome-stable', { + 'linux': '/opt/google/chrome/chrome', + 'darwin': '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome', + 'win32': `\\Google\\Chrome\\Application\\chrome.exe`, })); this._executables.push(this._createBidiChannel('bidi-chrome-canary', { 'linux': '', diff --git a/tests/bidi/playwright.config.ts b/tests/bidi/playwright.config.ts index 5b377cc704..bc7b29e56b 100644 --- a/tests/bidi/playwright.config.ts +++ b/tests/bidi/playwright.config.ts @@ -63,7 +63,7 @@ if (executablePath && !process.env.TEST_WORKER_INDEX) console.error(`Using executable at ${executablePath}`); const testIgnore: RegExp[] = []; const browserToChannels = { - '_bidiChromium': ['bidi-chrome-beta'], + '_bidiChromium': ['bidi-chrome-stable'], '_bidiFirefox': ['bidi-firefox-stable'], }; for (const [key, channels] of Object.entries(browserToChannels)) {