fix: do not require --force flag when installing channel on CI (#13487)

This commit is contained in:
Andrey Lushnikov 2022-04-11 14:42:21 -06:00 committed by GitHub
parent 1e1df6395f
commit 0f6638190e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions

View File

@ -234,7 +234,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force chrome - run: npx playwright install --with-deps chrome
- run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest
env: env:
PWTEST_CHANNEL: chrome PWTEST_CHANNEL: chrome
@ -259,7 +259,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force chrome - run: npx playwright install --with-deps chrome
- run: npm run ctest - run: npm run ctest
shell: bash shell: bash
env: env:
@ -286,7 +286,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force chrome - run: npx playwright install --with-deps chrome
- run: npm run ctest - run: npm run ctest
env: env:
PWTEST_CHANNEL: chrome PWTEST_CHANNEL: chrome
@ -388,7 +388,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force msedge - run: npx playwright install --with-deps msedge
- run: npm run ctest - run: npm run ctest
env: env:
PWTEST_CHANNEL: msedge PWTEST_CHANNEL: msedge
@ -414,7 +414,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force msedge - run: npx playwright install --with-deps msedge
- run: npm run ctest - run: npm run ctest
shell: bash shell: bash
env: env:
@ -438,7 +438,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force msedge - run: npx playwright install --with-deps msedge
- run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest
env: env:
PWTEST_CHANNEL: msedge PWTEST_CHANNEL: msedge
@ -463,7 +463,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force msedge-beta - run: npx playwright install --with-deps msedge-beta
- run: npm run ctest - run: npm run ctest
env: env:
PWTEST_CHANNEL: msedge-beta PWTEST_CHANNEL: msedge-beta
@ -488,7 +488,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force msedge-beta - run: npx playwright install --with-deps msedge-beta
- run: npm run ctest - run: npm run ctest
shell: bash shell: bash
env: env:
@ -512,7 +512,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force msedge-beta - run: npx playwright install --with-deps msedge-beta
- run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest
env: env:
PWTEST_CHANNEL: msedge-beta PWTEST_CHANNEL: msedge-beta
@ -537,7 +537,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force msedge-dev - run: npx playwright install --with-deps msedge-dev
- run: npm run ctest - run: npm run ctest
env: env:
PWTEST_CHANNEL: msedge-dev PWTEST_CHANNEL: msedge-dev
@ -562,7 +562,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force msedge-dev - run: npx playwright install --with-deps msedge-dev
- run: npm run ctest - run: npm run ctest
shell: bash shell: bash
env: env:
@ -586,7 +586,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force msedge-dev - run: npx playwright install --with-deps msedge-dev
- run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest
env: env:
PWTEST_CHANNEL: msedge-dev PWTEST_CHANNEL: msedge-dev
@ -611,7 +611,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force chrome-beta - run: npx playwright install --with-deps chrome-beta
- run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run ctest
env: env:
PWTEST_CHANNEL: chrome-beta PWTEST_CHANNEL: chrome-beta
@ -636,7 +636,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force chrome-beta - run: npx playwright install --with-deps chrome-beta
- run: npm run ctest - run: npm run ctest
shell: bash shell: bash
env: env:
@ -663,7 +663,7 @@ jobs:
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
- run: npm run build - run: npm run build
- run: npx playwright install --with-deps --force chrome-beta - run: npx playwright install --with-deps chrome-beta
- run: npm run ctest - run: npm run ctest
env: env:
PWTEST_CHANNEL: chrome-beta PWTEST_CHANNEL: chrome-beta

View File

@ -600,7 +600,7 @@ export class Registry {
throw new Error(`ERROR: Playwright does not support installing ${executable.name}`); throw new Error(`ERROR: Playwright does not support installing ${executable.name}`);
const { langName } = getClientLanguage(); const { langName } = getClientLanguage();
if (!executable._isHermeticInstallation && !forceReinstall && executable.executablePath(langName)) { if (!getAsBooleanFromENV('CI') && !executable._isHermeticInstallation && !forceReinstall && executable.executablePath(langName)) {
const command = buildPlaywrightCLICommand(langName, 'install --force ' + executable.name); const command = buildPlaywrightCLICommand(langName, 'install --force ' + executable.name);
throw new Error('\n' + wrapInASCIIBox([ throw new Error('\n' + wrapInASCIIBox([
`ATTENTION: "${executable.name}" is already installed on the system!`, `ATTENTION: "${executable.name}" is already installed on the system!`,