Skip to content

Commit 1534a88

Browse files
devversionjelbourn
authored andcommitted
build: fix bazel ci compilation (angular#9267)
* Fixes the Bazel CI compilation by aligning the WORKSPACE with the latest one from angular/angular
1 parent 7053bd5 commit 1534a88

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

.circleci/config.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
anchor_1: &job_defaults
1212
working_directory: ~/ng
1313
docker:
14-
- image: angular/ngcontainer:0.0.4
14+
- image: angular/ngcontainer:0.1.0
1515

1616
# After checkout, rebase on top of master.
1717
# Similar to travis behavior, but not quite the same.
@@ -24,6 +24,7 @@ version: 2
2424
jobs:
2525
build:
2626
<<: *job_defaults
27+
resource_class: large
2728
steps:
2829
- checkout:
2930
<<: *post_checkout
@@ -32,9 +33,9 @@ jobs:
3233

3334
- run: bazel run @nodejs//:npm install
3435
# For some reason, circleci needs the postinstall to be run explicitly.
35-
# This may be unnecessary once ngcontainer uses nodejs 8
36+
# This may be unnecessary once rules_nodejs uses nodejs 8
3637
- run: bazel run @nodejs//:npm run postinstall
37-
- run: bazel build src/cdk/...
38+
- run: bazel build src/...
3839
- save_cache:
3940
key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
4041
paths:
@@ -49,3 +50,8 @@ workflows:
4950
notify:
5051
webhooks:
5152
- url: https://us-central1-test-jperrott.cloudfunctions.net/circleCi
53+
54+
general:
55+
branches:
56+
only:
57+
- master

WORKSPACE

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ workspace(name = "angular_material_src")
44
git_repository(
55
name = "build_bazel_rules_nodejs",
66
remote = "https://github.com/bazelbuild/rules_nodejs.git",
7-
# TODO(jelbourn): use the correct tag here.
8-
commit = "31d36ff2acdf630d1e331f38006cf1a5d303d338",
7+
commit = "0.3.1",
98
)
109

1110
# NOTE: this rule installs nodejs, npm, and yarn, but does NOT install
@@ -17,20 +16,31 @@ node_repositories(package_json = ["//:package.json"])
1716
git_repository(
1817
name = "io_bazel_rules_sass",
1918
remote = "https://github.com/bazelbuild/rules_sass.git",
20-
tag = "0.0.2",
19+
tag = "0.0.3",
2120
)
2221

2322
load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
2423
sass_repositories()
2524

2625
# Add TypeScript rules
27-
local_repository(
26+
git_repository(
2827
name = "build_bazel_rules_typescript",
29-
path = "node_modules/@bazel/typescript",
28+
remote = "https://github.com/bazelbuild/rules_typescript.git",
29+
commit = "89d2c75066bea3d9c942f29dd1d2ea543c58d6d5",
3030
)
3131

32+
# Setup TypeScript Bazel workspace
33+
load("@build_bazel_rules_typescript//:setup.bzl", "ts_setup_workspace")
34+
ts_setup_workspace()
35+
3236
# Add Angular rules
3337
local_repository(
3438
name = "angular",
3539
path = "node_modules/@angular/bazel",
3640
)
41+
42+
# Add rxjs
43+
local_repository(
44+
name = "rxjs",
45+
path = "node_modules/rxjs/src",
46+
)

0 commit comments

Comments
 (0)