From 1589f6f3034fe0563fd6196d8594a8c8e7a9f741 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Tue, 28 Jan 2020 11:17:10 -0600 Subject: [PATCH 1/2] Disable local selenium server when not needed --- .github/workflows/build_test_deploy.yml | 2 ++ test/jest-environment.js | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 818696d7d303da3..45438af4d35ff68 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -63,6 +63,7 @@ jobs: runs-on: ubuntu-latest needs: build env: + SKIP_LOCAL_SELENIUM_SERVER: true NEXT_TELEMETRY_DISABLED: 1 HEADLESS: true steps: @@ -80,6 +81,7 @@ jobs: env: NEXT_TELEMETRY_DISABLED: 1 BROWSERSTACK: true + SKIP_LOCAL_SELENIUM_SERVER: true BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }} BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }} steps: diff --git a/test/jest-environment.js b/test/jest-environment.js index fd5d8d640eac0b4..814798f9600d50a 100644 --- a/test/jest-environment.js +++ b/test/jest-environment.js @@ -4,7 +4,10 @@ const getPort = require('get-port') const seleniumServer = require('selenium-standalone') const NodeEnvironment = require('jest-environment-node') -const { BROWSER_NAME: browserName = 'chrome' } = process.env +const { + BROWSER_NAME: browserName = 'chrome', + SKIP_LOCAL_SELENIUM_SERVER, +} = process.env const newTabPg = ` @@ -38,7 +41,7 @@ class CustomEnvironment extends NodeEnvironment { let seleniumServerPort - if (browserName !== 'chrome') { + if (browserName !== 'chrome' && SKIP_LOCAL_SELENIUM_SERVER !== 'true') { console.log('Installing selenium server') await new Promise((resolve, reject) => { seleniumServer.install(err => { From 6e4719fa32f2d9a8ba92fc80fd4156cf8b9d679a Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Tue, 28 Jan 2020 11:34:09 -0600 Subject: [PATCH 2/2] Disable skipping for firefox as it appears to be needed still --- .github/workflows/build_test_deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 45438af4d35ff68..4fd8670ea8d6dd7 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -63,7 +63,6 @@ jobs: runs-on: ubuntu-latest needs: build env: - SKIP_LOCAL_SELENIUM_SERVER: true NEXT_TELEMETRY_DISABLED: 1 HEADLESS: true steps: