Skip to content

build: fix and re-enable bazel unit tests for the cdk #11278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 11, 2018
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
24 changes: 21 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,28 @@
# To validate changes, use an online parser, eg.
# http://yaml-online-parser.appspot.com/

## IMPORTANT
# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
var_1: &docker_image angular/ngcontainer:0.3.0
var_2: &cache_key v2-ng-mat-{{ .Branch }}-{{ checksum "package-lock.json" }}-0.3.0

# Define common ENV vars
var_3: &define_env_vars
run: echo "export PROJECT_ROOT=$(pwd)" >> $BASH_ENV

# See remote cache documentation in /docs/BAZEL.md
var_4: &setup-bazel-remote-cache
run:
name: Start up bazel remote cache proxy
command: ~/bazel-remote-proxy -backend circleci://
background: true

# Settings common to each job
anchor_1: &job_defaults
working_directory: ~/ng
docker:
- image: angular/ngcontainer:0.1.0
- image: *docker_image

# After checkout, rebase on top of master.
# Similar to travis behavior, but not quite the same.
Expand All @@ -29,15 +46,16 @@ jobs:
- checkout:
<<: *post_checkout
- restore_cache:
key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
key: *cache_key

- run: bazel run @nodejs//:npm install
# For some reason, circleci needs the postinstall to be run explicitly.
# This may be unnecessary once rules_nodejs uses nodejs 8
- run: bazel run @nodejs//:npm run postinstall
- run: bazel build src/...
- run: bazel test src/...
- save_cache:
key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
key: *cache_key
paths:
- "node_modules"

Expand Down
7 changes: 2 additions & 5 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ filegroup(
srcs = [
"//:node_modules/reflect-metadata/Reflect.js",
"//:node_modules/zone.js/dist/zone.js",
"//:node_modules/zone.js/dist/async-test.js",
"//:node_modules/zone.js/dist/sync-test.js",
"//:node_modules/zone.js/dist/fake-async-test.js",
"//:node_modules/zone.js/dist/proxy.js",
"//:node_modules/zone.js/dist/jasmine-patch.js",
"//:node_modules/zone.js/dist/zone-testing.js",
"//:node_modules/zone.js/dist/task-tracking.js",
],
)
20 changes: 13 additions & 7 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ workspace(name = "angular_material")
# Add nodejs rules
http_archive(
name = "build_bazel_rules_nodejs",
url = "https://github.com/bazelbuild/rules_nodejs/archive/1931156c232a08356dfda02e9c8b0275c2e63c00.zip",
strip_prefix = "rules_nodejs-1931156c232a08356dfda02e9c8b0275c2e63c00",
sha256 = "9cfe33276a6ac0076ee9ee159c4a2576f9851c0f437435b5ac19b2e592493078",
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.8.0.zip",
strip_prefix = "rules_nodejs-0.8.0",
sha256 = "4e40dd49ae7668d245c3107645f2a138660fcfd975b9310b91eda13f0c973953",
)

# NOTE: this rule installs nodejs, npm, and yarn, but does NOT install
# your npm dependencies. You must still run the package manager.
load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")

check_bazel_version("0.9.0")
check_bazel_version("0.13.0")
node_repositories(package_json = ["//:package.json"])

# Add sass rules
Expand All @@ -28,9 +28,9 @@ sass_repositories()
# Add TypeScript rules
http_archive(
name = "build_bazel_rules_typescript",
url = "https://github.com/bazelbuild/rules_typescript/archive/0.12.1.zip",
strip_prefix = "rules_typescript-0.12.1",
sha256 = "24e2c36f60508c6d270ae4265b89b381e3f66d550e70c367ed3755ad8d7ce3b0",
url = "https://github.com/bazelbuild/rules_typescript/archive/0.12.3.zip",
strip_prefix = "rules_typescript-0.12.3",
sha256 = "967068c3540f59407716fbeb49949c1600dbf387faeeab3089085784dd21f60c",
)

# Setup TypeScript Bazel workspace
Expand All @@ -48,3 +48,9 @@ local_repository(
name = "rxjs",
path = "node_modules/rxjs/src",
)


# This commit matches the version of buildifier in angular/ngcontainer
# If you change this, also check if it matches the version in the angular/ngcontainer
# version in /.circleci/config.yml
BAZEL_BUILDTOOLS_VERSION = "fd9878fd5de921e0bbab3dcdcb932c2627812ee1"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"systemjs": "0.19.43",
"tsickle": "^0.27.2",
"tslib": "^1.9.0",
"zone.js": "^0.8.4"
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular-devkit/core": "^0.5.12",
Expand Down
1 change: 0 additions & 1 deletion src/cdk/a11y/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ ts_web_test(
bootstrap = [
"//:web_test_bootstrap_scripts",
],
tags = ["manual"],
# Do not sort
deps = [
"//:tslib_bundle",
Expand Down
2 changes: 0 additions & 2 deletions src/cdk/accordion/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ ts_library(
ts_web_test(
name = "unit_tests",
bootstrap = ["//:web_test_bootstrap_scripts"],
tags = ["manual"],

# Do not sort
deps = [
"//:tslib_bundle",
Expand Down
2 changes: 0 additions & 2 deletions src/cdk/bidi/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ ts_web_test(
bootstrap = [
"//:web_test_bootstrap_scripts",
],
tags = ["manual"],

# Do not sort
deps = [
"//:tslib_bundle",
Expand Down
1 change: 0 additions & 1 deletion src/cdk/coercion/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ ts_library(
ts_web_test(
name = "unit_tests",
bootstrap = ["//:web_test_bootstrap_scripts"],
tags = ["manual"],
deps = [":coercion_test_sources"],
)
2 changes: 0 additions & 2 deletions src/cdk/collections/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ ts_library(
ts_web_test(
name = "unit_tests",
bootstrap = ["//:web_test_bootstrap_scripts"],
tags = ["manual"],

# Do not sort
deps = [
"//:tslib_bundle",
Expand Down
2 changes: 0 additions & 2 deletions src/cdk/layout/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ ts_library(
ts_web_test(
name = "unit_tests",
bootstrap = ["//:web_test_bootstrap_scripts"],
tags = ["manual"],

# Do not sort
deps = [
"//:tslib_bundle",
Expand Down
2 changes: 0 additions & 2 deletions src/cdk/observers/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ ts_library(
ts_web_test(
name = "unit_tests",
bootstrap = ["//:web_test_bootstrap_scripts"],
tags = ["manual"],

# Do not sort
deps = [
"//:tslib_bundle",
Expand Down
1 change: 0 additions & 1 deletion src/cdk/portal/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ ts_library(
ts_web_test(
name = "unit_tests",
bootstrap = ["//:web_test_bootstrap_scripts"],
tags = ["manual"],
# Do not sort
deps = [
"//:tslib_bundle",
Expand Down
2 changes: 0 additions & 2 deletions src/cdk/scrolling/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ ts_web_test(
bootstrap = [
"//:web_test_bootstrap_scripts",
],
tags = ["manual"],

# Do not sort
deps = [
"//:tslib_bundle",
Expand Down
1 change: 0 additions & 1 deletion src/cdk/table/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ ts_library(
ts_web_test(
name = "unit_tests",
bootstrap = ["//:web_test_bootstrap_scripts"],
tags = ["manual"],
# Do not sort
deps = [
"//:tslib_bundle",
Expand Down