File tree Expand file tree Collapse file tree 11 files changed +31
-14
lines changed Expand file tree Collapse file tree 11 files changed +31
-14
lines changed Original file line number Diff line number Diff line change 1313# If you change the cache key prefix, also sync the restore_cache fallback to match.
1414# Keep the static part of the cache key as prefix to enable correct fallbacks.
1515# See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
16- var_1 : &docker_image circleci/node:10.12
17- var_2 : &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
16+ var_1 : &default_docker_image circleci/node:10.12
17+ var_2 : &browsers_docker_image circleci/node:10.12-browsers
18+ var_3 : &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
1819
1920# Settings common to each job
2021anchor_1 : &defaults
2122 working_directory : ~/ng
2223 docker :
23- - image : *docker_image
24+ - image : *default_docker_image
2425
2526# After checkout, rebase on top of target branch.
2627anchor_2 : &post_checkout
8990
9091 test-large :
9192 << : *defaults
93+ docker :
94+ - image : *browsers_docker_image
9295 resource_class : large
9396 parallelism : 4
9497 steps :
98101
99102 e2e-cli :
100103 << : *defaults
104+ docker :
105+ - image : *browsers_docker_image
101106 environment :
102107 BASH_ENV : ~/.profile
103108 NPM_CONFIG_PREFIX : ~/.npm-global
@@ -112,6 +117,8 @@ jobs:
112117
113118 e2e-cli-ivy :
114119 << : *defaults
120+ docker :
121+ - image : *browsers_docker_image
115122 environment :
116123 BASH_ENV : ~/.profile
117124 NPM_CONFIG_PREFIX : ~/.npm-global
Original file line number Diff line number Diff line change 2828 "build-tsc" : " tsc -p tsconfig.json" ,
2929 "fix" : " npm run admin -- lint --fix" ,
3030 "lint" : " npm run admin -- lint" ,
31- "prebuildifier" : " bazel build --noshow_progress @com_github_bazelbuild_buildtools//buildifier" ,
32- "buildifier" : " find . -type f \\ ( -name BUILD -or -name BUILD.bazel \\ ) ! -path \" */node_modules/*\" | xargs $(bazel info bazel-bin)/external/com_github_bazelbuild_buildtools/buildifier/buildifier" ,
3331 "templates" : " node ./bin/devkit-admin templates" ,
3432 "test" : " node ./bin/devkit-admin test" ,
3533 "test-large" : " node ./bin/devkit-admin test --large --spec-reporter" ,
8684 "@angular/compiler-cli" : " ^8.0.0-beta.12" ,
8785 "@bazel/bazel" : " 0.24.1" ,
8886 "@bazel/buildifier" : " ^0.22.0" ,
87+ "@bazel/jasmine" : " ~0.26.0" ,
8988 "@bazel/karma" : " ~0.26.0" ,
9089 "@bazel/typescript" : " ~0.26.0" ,
9190 "@ngtools/json-schema" : " ^1.1.0" ,
Original file line number Diff line number Diff line change 55
66licenses (["notice" ]) # MIT
77
8+ load ("@npm_bazel_jasmine//:index.bzl" , "jasmine_node_test" )
89load ("@npm_bazel_typescript//:defs.bzl" , "ts_library" )
9- load ("@build_bazel_rules_nodejs//:defs.bzl" , "jasmine_node_test" , " npm_package" )
10+ load ("@build_bazel_rules_nodejs//:defs.bzl" , "npm_package" )
1011
1112package (default_visibility = ["//visibility:public" ])
1213
Original file line number Diff line number Diff line change 55
66licenses (["notice" ]) # MIT
77
8+ load ("@npm_bazel_jasmine//:index.bzl" , "jasmine_node_test" )
89load ("@npm_bazel_typescript//:defs.bzl" , "ts_library" )
9- load ("@build_bazel_rules_nodejs//:defs.bzl" , "jasmine_node_test" , " npm_package" )
10+ load ("@build_bazel_rules_nodejs//:defs.bzl" , "npm_package" )
1011
1112package (default_visibility = ["//visibility:public" ])
1213
Original file line number Diff line number Diff line change 44# found in the LICENSE file at https://angular.io/license
55package (default_visibility = ["//visibility:public" ])
66
7+ load ("@npm_bazel_jasmine//:index.bzl" , "jasmine_node_test" )
78load ("@npm_bazel_typescript//:defs.bzl" , "ts_library" )
8- load ("@build_bazel_rules_nodejs//:defs.bzl" , "jasmine_node_test" , " npm_package" )
9+ load ("@build_bazel_rules_nodejs//:defs.bzl" , "npm_package" )
910
1011licenses (["notice" ]) # MIT License
1112
Original file line number Diff line number Diff line change 44# found in the LICENSE file at https://angular.io/license
55package (default_visibility = ["//visibility:public" ])
66
7+ load ("@npm_bazel_jasmine//:index.bzl" , "jasmine_node_test" )
78load ("@npm_bazel_typescript//:defs.bzl" , "ts_library" )
8- load ("@build_bazel_rules_nodejs//:defs.bzl" , "jasmine_node_test" , " npm_package" )
9+ load ("@build_bazel_rules_nodejs//:defs.bzl" , "npm_package" )
910
1011licenses (["notice" ]) # MIT License
1112
Original file line number Diff line number Diff line change 55
66licenses (["notice" ]) # MIT
77
8+ load ("@npm_bazel_jasmine//:index.bzl" , "jasmine_node_test" )
89load ("@npm_bazel_typescript//:defs.bzl" , "ts_library" )
9- load ("@build_bazel_rules_nodejs//:defs.bzl" , "jasmine_node_test" )
1010load ("//tools:ts_json_schema.bzl" , "ts_json_schema" )
1111
1212package (default_visibility = ["//visibility:public" ])
Original file line number Diff line number Diff line change 66licenses (["notice" ]) # MIT
77
88load ("@npm_bazel_typescript//:defs.bzl" , "ts_library" )
9-
10- # load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
119load ("//tools:ts_json_schema.bzl" , "ts_json_schema" )
1210
1311package (default_visibility = ["//visibility:public" ])
Original file line number Diff line number Diff line change 55
66licenses (["notice" ]) # MIT
77
8+ load ("@npm_bazel_jasmine//:index.bzl" , "jasmine_node_test" )
89load ("@npm_bazel_typescript//:defs.bzl" , "ts_library" )
9- load ("@build_bazel_rules_nodejs//:defs.bzl" , "jasmine_node_test" )
1010load ("//tools:ts_json_schema.bzl" , "ts_json_schema" )
1111
1212package (default_visibility = ["//visibility:public" ])
@@ -30,6 +30,7 @@ ts_library(
3030 "@npm//@types/node" ,
3131 "@npm//@types/semver" ,
3232 "@npm//rxjs" ,
33+ "@npm//semver" ,
3334 ],
3435)
3536
Original file line number Diff line number Diff line change @@ -80,6 +80,7 @@ const ignoredPackages = [
8080 '@bazel/bazel-linux_x64@0.24.1' ,
8181 '@bazel/buildifier@0.22.0' ,
8282 '@bazel/buildifier-linux_x64@0.22.0' ,
83+ '@bazel/jasmine@0.26.0' ,
8384
8485 // * Other
8586 'font-awesome@4.7.0' , // (OFL-1.1 AND MIT)
You can’t perform that action at this time.
0 commit comments