ci: fix bazel build and re-add it to CI

hansl · hansl · commit 4c7fce5b7693 · 2018-06-05T17:55:18.000-07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -82,13 +82,14 @@ jobs:
       - restore_cache: *_root_package_lock_key
       - run: npm run admin -- build
 
-  #  build-bazel:
-  #    <<: *defaults
-  #    steps:
-  #      - checkout: *post_checkout
-  #      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-  #      - run: bazel run @nodejs//:npm install
-  #      - run: bazel build //packages/...
+  build-bazel:
+    <<: *defaults
+    resource_class: large
+    steps:
+      - checkout: *post_checkout
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - run: bazel run @nodejs//:npm install
+      - run: bazel build //packages/...
 
   snapshot_publish:
     <<: *defaults
@@ -133,10 +134,10 @@ workflows:
           requires:
             - lint
             - validate
-      #      - build-bazel:
-      #          requires:
-      #            - lint
-      #            - validate
+      - build-bazel:
+          requires:
+            - lint
+            - validate
       - test:
           requires:
             - build
diff --git a/WORKSPACE b/WORKSPACE
@@ -12,6 +12,11 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_reposi
 check_bazel_version("0.9.0")
 node_repositories(package_json = ["//:package.json"])
 
+local_repository(
+    name = "rxjs",
+    path = "node_modules/rxjs/src",
+)
+
 # Pick up the fix for source-map typings
 RULES_TYPESCRIPT_VERSION = "00f8fd5467f2b12ac2fbb8d74ea81d2dd5636d31"
 http_archive(
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
@@ -21,7 +21,8 @@ ts_library(
     module_name = "@angular-devkit/core",
     module_root = "src",
     deps = [
-        # @deps: rxjs
+        "@rxjs",
+        "@rxjs//operators",
         # @typings: es2015.core
         # @typings: es2015.symbol.wellknown
         # @typings: ajv
@@ -44,7 +45,8 @@ ts_library(
     module_root = "node",
     deps = [
         "//packages/angular_devkit/core",
-        # @deps: rxjs
+        "@rxjs",
+        "@rxjs//operators",
     ],
 )
 
@@ -59,7 +61,8 @@ ts_library(
     deps = [
         ":core",
         ":node",
-        # @deps: rxjs
+        "@rxjs",
+        "@rxjs//operators",
         # @typings: jasmine
     ],
 )
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
@@ -22,7 +22,8 @@ ts_library(
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",  # TODO: get rid of this for 6.0
-        # @deps: rxjs
+        "@rxjs",
+        "@rxjs//operators",
     ],
 )
 
@@ -42,7 +43,8 @@ ts_library(
         ":schematics",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        # @deps: rxjs
+        "@rxjs",
+        "@rxjs//operators",
     ],
 )
 
@@ -62,7 +64,8 @@ ts_library(
         ":tasks",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        # @deps: rxjs
+        "@rxjs",
+        "@rxjs//operators",
     ],
 )
 
@@ -79,7 +82,8 @@ ts_library(
         ":tasks",
         ":tools",
         "//packages/angular_devkit/core",
-        # @deps: rxjs
+        "@rxjs",
+        "@rxjs//operators",
     ],
 )
 
@@ -91,7 +95,8 @@ ts_library(
     deps = [
         ":schematics",
         "//packages/angular_devkit/core",
-        # @deps: rxjs
+        "@rxjs",
+        "@rxjs//operators",
         # @typings: jasmine
     ],
 )
@@ -105,7 +110,9 @@ ts_library(
         ":schematics",
         ":tools",
         "//packages/angular_devkit/core",
-        # @deps: rxjs
+        "//packages/angular_devkit/core:node",
+        "@rxjs",
+        "@rxjs//operators",
         # @typings: jasmine
     ],
 )
diff --git a/packages/angular_devkit/schematics_cli/BUILD b/packages/angular_devkit/schematics_cli/BUILD
@@ -27,6 +27,7 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
         "//packages/angular_devkit/schematics:tools",
-        # @deps: rxjs
+        "@rxjs",
+        "@rxjs//operators",
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ ts_library(`
`27`	`27`	`"//packages/angular_devkit/schematics",`
`28`	`28`	`"//packages/angular_devkit/schematics:tasks",`
`29`	`29`	`"//packages/angular_devkit/schematics:tools",`
`30`		`- # @deps: rxjs`
	`30`	`+ "@rxjs",`
	`31`	`+ "@rxjs//operators",`
`31`	`32`	`],`
`32`	`33`	`)`