diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 48aacf21860cc..4abd22a86497b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,13 +48,14 @@ jobs: path: test-results test_mac: - name: "macOS" + name: ${{ matrix.os }} (${{ matrix.browser }}) strategy: fail-fast: false matrix: + os: [macos-10.15, macos-11.0] browser: [chromium, firefox, webkit] shard: ['1', '2'] - runs-on: macos-latest + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 @@ -70,7 +71,7 @@ jobs: - uses: actions/upload-artifact@v1 if: ${{ always() }} with: - name: ${{ matrix.browser }}-mac-test-results-${{ matrix.shard }} + name: ${{ matrix.browser }}-${{ matrix.os }}-test-results path: test-results test_win: diff --git a/src/install/browserFetcher.ts b/src/install/browserFetcher.ts index dd38acb1f7251..7f4cfa2f82a47 100644 --- a/src/install/browserFetcher.ts +++ b/src/install/browserFetcher.ts @@ -67,6 +67,7 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br ['mac10.13', '%s/chromium-browser-snapshots/Mac/%d/chrome-mac.zip'], ['mac10.14', '%s/chromium-browser-snapshots/Mac/%d/chrome-mac.zip'], ['mac10.15', '%s/chromium-browser-snapshots/Mac/%d/chrome-mac.zip'], + ['mac11.0', '%s/chromium-browser-snapshots/Mac/%d/chrome-mac.zip'], ['win32', '%s/chromium-browser-snapshots/Win/%d/chrome-win.zip'], ['win64', '%s/chromium-browser-snapshots/Win_x64/%d/chrome-win.zip'], ]).get(platform) : @@ -76,6 +77,7 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br ['mac10.13', '%s/builds/chromium/%s/chromium-mac.zip'], ['mac10.14', '%s/builds/chromium/%s/chromium-mac.zip'], ['mac10.15', '%s/builds/chromium/%s/chromium-mac.zip'], + ['mac11.0', '%s/builds/chromium/%s/chromium-mac.zip'], ['win32', '%s/builds/chromium/%s/chromium-win32.zip'], ['win64', '%s/builds/chromium/%s/chromium-win64.zip'], ]).get(platform); @@ -90,6 +92,7 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br ['mac10.13', '%s/builds/firefox/%s/firefox-mac.zip'], ['mac10.14', '%s/builds/firefox/%s/firefox-mac.zip'], ['mac10.15', '%s/builds/firefox/%s/firefox-mac.zip'], + ['mac11.0', '%s/builds/firefox/%s/firefox-mac.zip'], ['win32', '%s/builds/firefox/%s/firefox-win32.zip'], ['win64', '%s/builds/firefox/%s/firefox-win64.zip'], ]).get(platform) : @@ -99,6 +102,7 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br ['mac10.13', '%s/builds/firefox/%s/firefox-mac-10.14.zip'], ['mac10.14', '%s/builds/firefox/%s/firefox-mac-10.14.zip'], ['mac10.15', '%s/builds/firefox/%s/firefox-mac-10.14.zip'], + ['mac11.0', '%s/builds/firefox/%s/firefox-mac-10.14.zip'], ['win32', '%s/builds/firefox/%s/firefox-win32.zip'], ['win64', '%s/builds/firefox/%s/firefox-win64.zip'], ]).get(platform); @@ -113,6 +117,7 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br ['mac10.13', undefined], ['mac10.14', '%s/builds/webkit/%s/minibrowser-mac-10.14.zip'], ['mac10.15', '%s/builds/webkit/%s/minibrowser-mac-10.15.zip'], + ['mac11.0', '%s/builds/webkit/%s/minibrowser-mac-10.15.zip'], ['win32', '%s/builds/webkit/%s/minibrowser-win64.zip'], ['win64', '%s/builds/webkit/%s/minibrowser-win64.zip'], ]).get(platform) : @@ -122,6 +127,7 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br ['mac10.13', undefined], ['mac10.14', '%s/builds/webkit/%s/webkit-mac-10.14.zip'], ['mac10.15', '%s/builds/webkit/%s/webkit-mac-10.15.zip'], + ['mac11.0', '%s/builds/webkit/%s/webkit-mac-10.15.zip'], ['win32', '%s/builds/webkit/%s/webkit-win64.zip'], ['win64', '%s/builds/webkit/%s/webkit-win64.zip'], ]).get(platform); diff --git a/src/utils/browserPaths.ts b/src/utils/browserPaths.ts index 151d2bdc4b3d8..242f26c1cef60 100644 --- a/src/utils/browserPaths.ts +++ b/src/utils/browserPaths.ts @@ -22,7 +22,7 @@ import { getUbuntuVersionSync } from './ubuntuVersion'; import { getFromENV } from './utils'; export type BrowserName = 'chromium'|'webkit'|'firefox'; -export type BrowserPlatform = 'win32'|'win64'|'mac10.13'|'mac10.14'|'mac10.15'|'ubuntu18.04'|'ubuntu20.04'; +export type BrowserPlatform = 'win32'|'win64'|'mac10.13'|'mac10.14'|'mac10.15'|'mac11.0'|'ubuntu18.04'|'ubuntu20.04'; export type BrowserDescriptor = { name: BrowserName, revision: string, @@ -81,6 +81,7 @@ export function executablePath(browserPath: string, browser: BrowserDescriptor): ['mac10.13', ['chrome-mac', 'Chromium.app', 'Contents', 'MacOS', 'Chromium']], ['mac10.14', ['chrome-mac', 'Chromium.app', 'Contents', 'MacOS', 'Chromium']], ['mac10.15', ['chrome-mac', 'Chromium.app', 'Contents', 'MacOS', 'Chromium']], + ['mac11.0', ['chrome-mac', 'Chromium.app', 'Contents', 'MacOS', 'Chromium']], ['win32', ['chrome-win', 'chrome.exe']], ['win64', ['chrome-win', 'chrome.exe']], ]).get(hostPlatform); @@ -93,6 +94,7 @@ export function executablePath(browserPath: string, browser: BrowserDescriptor): ['mac10.13', ['firefox', 'Nightly.app', 'Contents', 'MacOS', 'firefox']], ['mac10.14', ['firefox', 'Nightly.app', 'Contents', 'MacOS', 'firefox']], ['mac10.15', ['firefox', 'Nightly.app', 'Contents', 'MacOS', 'firefox']], + ['mac11.0', ['firefox', 'Nightly.app', 'Contents', 'MacOS', 'firefox']], ['win32', ['firefox', 'firefox.exe']], ['win64', ['firefox', 'firefox.exe']], ]).get(hostPlatform); @@ -105,6 +107,7 @@ export function executablePath(browserPath: string, browser: BrowserDescriptor): ['mac10.13', undefined], ['mac10.14', ['pw_run.sh']], ['mac10.15', ['pw_run.sh']], + ['mac11.0', ['pw_run.sh']], ['win32', ['Playwright.exe']], ['win64', ['Playwright.exe']], ]).get(hostPlatform);