Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

## IMPORTANT
# If you change the `default_docker_image` version, also change the `cache_key` version
var_1: &default_docker_image circleci/node:12.18.3
var_2: &browsers_docker_image circleci/node:12.18.3-browsers
var_1: &default_docker_image circleci/node:12.22.7

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a version of node which supports m1?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The architect e2e rule relies on host's version of chrome. In order for ci to pass I need a matching chrome version in package.json and whatever this docker container contains.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version of chrome in the previous container version didn't have an m1 release.

var_2: &browsers_docker_image circleci/node:12.22.7-browsers
var_3: &cache_key node-12.18.3-{{ checksum "yarn.lock" }}

var_4: &init_environment
Expand Down
5 changes: 4 additions & 1 deletion examples/angular_bazel_architect/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
"lint": "bazel run :lint",
"e2e": "bazel test :e2e",
"postinstall": "patch-package && yarn webdriver-update && ngcc --properties es2015 browser module main --first-only",
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 85.0.4183.38"
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 96.0.4664.110"
},
"private": true,
"resolutions": {
"**/webdriver-manager": "^12.1.8"
},
"dependencies": {
"@angular/animations": "11.2.3",
"@angular/common": "11.2.3",
Expand Down
8 changes: 4 additions & 4 deletions examples/angular_bazel_architect/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10227,10 +10227,10 @@ webdriver-js-extender@2.1.0:
"@types/selenium-webdriver" "^3.0.0"
selenium-webdriver "^3.0.1"

webdriver-manager@^12.1.7:
version "12.1.7"
resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.7.tgz#ed4eaee8f906b33c146e869b55e850553a1b1162"
integrity sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==
webdriver-manager@^12.1.7, webdriver-manager@^12.1.8:
version "12.1.8"
resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.8.tgz#5e70e73eaaf53a0767d5745270addafbc5905fd4"
integrity sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==
dependencies:
adm-zip "^0.4.9"
chalk "^1.1.1"
Expand Down