diff --git a/.circleci/config.yml b/.circleci/config.yml index 02aba99420..809ca9935b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,8 +65,8 @@ var_10: &only_on_master # (Using the tag in not necessary when pinning by ID, but include it anyway for documentation purposes.) # **NOTE 2**: If you change the version of the docker images, also change the `cache_key` suffix. # **NOTE 3**: If you change the version of the `*-browsers` docker image, make sure the -# `CI_CHROMEDRIVER_VERSION_ARG` env var (in `.circleci/env.sh`) points to a ChromeDriver -# version that is compatible with the Chrome version in the image. +# `--versions.chrome` arg in `integration/bazel-schematics/test.sh` specifies a +# ChromeDriver version that is compatible with the Chrome version in the image. executors: default-executor: parameters: diff --git a/.circleci/env.sh b/.circleci/env.sh index 1b66e6412c..717a4c8f01 100755 --- a/.circleci/env.sh +++ b/.circleci/env.sh @@ -19,11 +19,6 @@ setPublicVar CI_AIO_MIN_PWA_SCORE "95"; # This is the branch being built; e.g. `pull/12345` for PR builds. setPublicVar CI_BRANCH "$CIRCLE_BRANCH"; setPublicVar CI_BUILD_URL "$CIRCLE_BUILD_URL"; -# ChromeDriver version compatible with the Chrome version included in the docker image used in -# `.circleci/config.yml`. See http://chromedriver.chromium.org/downloads for a list of versions. -# This variable is intended to be passed as an arg to the `webdriver-manager update` command (e.g. -# `"postinstall": "webdriver-manager update $CI_CHROMEDRIVER_VERSION_ARG"`). -setPublicVar CI_CHROMEDRIVER_VERSION_ARG "--versions.chrome 79.0.3945.130"; setPublicVar CI_COMMIT "$CIRCLE_SHA1"; # `CI_COMMIT_RANGE` is only used on push builds (a.k.a. non-PR, non-scheduled builds and rerun # workflows of such builds). diff --git a/integration/bazel-schematics/test.sh b/integration/bazel-schematics/test.sh index bf5c1f5b43..9641809291 100755 --- a/integration/bazel-schematics/test.sh +++ b/integration/bazel-schematics/test.sh @@ -53,7 +53,9 @@ function testNonBazel() { yarn --cwd node_modules/@angular/cli version --new-version 0.0.0 --no-git-tag-version # re-add build-angular yarn add --dev file:../../../node_modules/@angular-devkit/build-angular - yarn webdriver-manager update --gecko=false --standalone=false ${CI_CHROMEDRIVER_VERSION_ARG:---versions.chrome 2.45} + # TODO: Find a way to use the Chrome version provided by `puppeteer` as the rest of the + # integration projects. See https://github.com/angular/angular/pull/35049 for details. + yarn webdriver-manager update --gecko=false --standalone=false --versions.chrome=79.0.3945.130; ng build --progress=false ng test --progress=false --watch=false ng e2e --configuration=production --webdriver-update=false