File tree Expand file tree Collapse file tree 4 files changed +32
-14
lines changed Expand file tree Collapse file tree 4 files changed +32
-14
lines changed Original file line number Diff line number Diff line change 11environment :
2- # Note: if updating to Node 10, use at least 10.5.0 to include a fix for
3- # https://github.com/nodejs/node/issues/20297
4- nodejs_version : " 8.9.2" # Same version as used in CircleCI.
2+ nodejs_version : " 10.9.0" # Same version as used in CircleCI.
53
64matrix :
75 fast_finish : true
86
97install :
108 - ps : Install-Product node $env:nodejs_version
11- - yarn install --frozen-lockfile
12- - npm run webdriver-update-appveyor
9+ # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221
10+ - yarn --frozen-lockfile --network-timeout=500000
11+ - yarn webdriver-update-appveyor
1312
1413test_script :
1514 - node --version
Original file line number Diff line number Diff line change 1212# # IMPORTANT
1313# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
1414# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
15- var_1 : &docker_image angular/ngcontainer:0.3.3
16- var_2 : &cache_key angular_devkit-{{ checksum "yarn.lock" }}-0.3.3-2
15+ var_1 : &docker_image angular/ngcontainer:0.5.0
16+ var_2 : &cache_key angular_devkit-{{ checksum "yarn.lock" }}-0.5.0
17+ var_3 : &node_8_docker_image angular/ngcontainer:0.3.3
1718
1819# Settings common to each job
1920anchor_1 : &defaults
8485 parallelism : 4
8586 steps :
8687 - attach_workspace : *attach_options
87- - run : npm install --global npm@6
8888 - run : xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
89+
90+ e2e-node-8 :
91+ << : *defaults
92+ # Overwrite docker image to node 8.
93+ docker :
94+ - image : *node_8_docker_image
95+ environment :
96+ BASH_ENV : ~/.profile
97+ resource_class : xlarge
98+ parallelism : 4
99+ steps :
100+ - attach_workspace : *attach_options
101+ - run : npm install --global npm@6
102+ - run : xvfb-run -a node ./tests/legacy-cli/run_e2e --glob=tests/basic/*
89103
90104 build :
91105 << : *defaults
@@ -153,6 +167,9 @@ workflows:
153167 - e2e-cli :
154168 requires :
155169 - build
170+ - e2e-node-8 :
171+ requires :
172+ - build
156173 - snapshot_publish :
157174 requires :
158175 - test
Original file line number Diff line number Diff line change @@ -29,9 +29,9 @@ go_register_toolchains()
2929# We need a minimum of this version to include https://github.com/bazelbuild/rules_nodejs/pull/281.
3030http_archive (
3131 name = "build_bazel_rules_nodejs" ,
32- url = "https://github.com/bazelbuild/rules_nodejs/archive/c75e3dd0571b0937e3ce0c4f0e6b6b50d90468f0 .zip" ,
33- strip_prefix = "rules_nodejs-c75e3dd0571b0937e3ce0c4f0e6b6b50d90468f0 " ,
34- sha256 = "b78506ddaed7c682027f873d2bd50086a28570b3187da9fa16fe1672eed3015e " ,
32+ url = "https://github.com/bazelbuild/rules_nodejs/archive/0.12.4 .zip" ,
33+ strip_prefix = "rules_nodejs-0.12.4 " ,
34+ sha256 = "c482700e032b4df60425cb9a6f8f28152fb1c4c947a9d61e6132fc59ce332b16 " ,
3535)
3636
3737# Load the TypeScript rules, its dependencies, and setup the workspace.
@@ -58,6 +58,8 @@ check_bazel_version("0.15.0")
5858node_repositories (
5959 package_json = ["//:package.json" ],
6060 preserve_symlinks = True ,
61+ node_version = "10.3.0" ,
62+ yarn_version = "1.6.0" ,
6163)
6264
6365local_repository (
Original file line number Diff line number Diff line change 3535 "validate-commits" : " ./bin/devkit-admin validate-commits" ,
3636 "prepush" : " node ./bin/devkit-admin hooks/pre-push" ,
3737 "webdriver-update-appveyor" : " webdriver-manager update --standalone false --gecko false --versions.chrome 2.37" ,
38- "webdriver-update-circleci" : " webdriver-manager update --standalone false --gecko false --versions.chrome 2.33 "
38+ "webdriver-update-circleci" : " webdriver-manager update --standalone false --gecko false --versions.chrome $CHROMEDRIVER_VERSION_ARG "
3939 },
4040 "repository" : {
4141 "type" : " git" ,
4242 "url" : " https://github.com/angular/angular-cli.git"
4343 },
4444 "engines" : {
45- "node" : " >= 8.9 .0" ,
46- "npm " : " >= 5.5.1 "
45+ "node" : " >=10.3.0 <11.0 .0" ,
46+ "yarn " : " >=1.6.0 <2.0.0 "
4747 },
4848 "author" : " Angular Authors" ,
4949 "license" : " MIT" ,
You can’t perform that action at this time.
0 commit comments