diff --git a/.circleci/bazel.rc b/.circleci/bazel.rc index 921c6293cf367..58e0802184761 100644 --- a/.circleci/bazel.rc +++ b/.circleci/bazel.rc @@ -15,11 +15,16 @@ build --experimental_remote_spawn_cache --remote_rest_cache=http://localhost:764 # Prevent unstable environment variables from tainting cache keys build --experimental_strict_action_env +# Save downloaded repositories such as the go toolchain +# This directory can then be included in the CircleCI cache +# It should save time running the first build +build --experimental_repository_cache=/home/circleci/bazel_repository_cache + # Workaround https://github.com/bazelbuild/bazel/issues/3645 # Bazel doesn't calculate the memory ceiling correctly when running under Docker. -# Limit Bazel to consuming resources that fit in CircleCI "medium" class which is the default: +# Limit Bazel to consuming resources that fit in CircleCI "xlarge" class # https://circleci.com/docs/2.0/configuration-reference/#resource_class -build --local_resources=3072,2.0,1.0 +build --local_resources=14336,8.0,1.0 # Retry in the event of flakes, eg. https://circleci.com/gh/angular/angular/31309 test --flaky_test_attempts=2 diff --git a/.circleci/config.yml b/.circleci/config.yml index dcc04f93e19b7..74d5260504957 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ # 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.1.0 -var_2: &cache_key angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.1.0 +var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.1.0 # See remote cache documentation in /docs/BAZEL.md var_3: &setup-bazel-remote-cache @@ -59,7 +59,7 @@ jobs: build: <<: *job_defaults - resource_class: large + resource_class: xlarge steps: - checkout: <<: *post_checkout @@ -71,6 +71,7 @@ jobs: - restore_cache: key: *cache_key + - run: ls /home/circleci/bazel_repository_cache || true - run: bazel info release - run: bazel run @yarn//:yarn # Use bazel query so that we explicitly ask for all buildable targets to be built as well @@ -82,6 +83,7 @@ jobs: key: *cache_key paths: - "node_modules" + - "~/bazel_repository_cache" workflows: version: 2 diff --git a/CHANGELOG.md b/CHANGELOG.md index f5b660bd53e60..74804beddc010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ + +## [5.2.9](https://github.com/angular/angular/compare/5.2.8...5.2.9) (2018-03-14) + + +### Bug Fixes + +* **platform-server:** add styles to elements correctly ([#22527](https://github.com/angular/angular/issues/22527)) ([fc6dfc2](https://github.com/angular/angular/commit/fc6dfc2)) +* **router:** correct over-encoding of URL fragment ([#22687](https://github.com/angular/angular/issues/22687)) ([86517f2](https://github.com/angular/angular/commit/86517f2)) + + + ## [5.2.8](https://github.com/angular/angular/compare/5.2.7...5.2.8) (2018-03-07) diff --git a/aio/content/examples/reactive-forms/src/app/app.module.ts b/aio/content/examples/reactive-forms/src/app/app.module.ts index 1772861c8529b..39b074c178004 100644 --- a/aio/content/examples/reactive-forms/src/app/app.module.ts +++ b/aio/content/examples/reactive-forms/src/app/app.module.ts @@ -6,32 +6,38 @@ import { BrowserModule } from '@angular/platform-browser'; import { ReactiveFormsModule } from '@angular/forms'; // <-- #1 import module import { AppComponent } from './app.component'; -import { HeroDetailComponent } from './hero-detail/hero-detail.component'; // <-- #1 import component +import { HeroDetailComponent } from './hero-detail/hero-detail.component'; // #enddocregion v1 +// #docregion hero-service-list +// add JavaScript imports import { HeroListComponent } from './hero-list/hero-list.component'; - -import { HeroService } from './hero.service'; // <-- #1 import service +import { HeroService } from './hero.service'; // #docregion v1 @NgModule({ - imports: [ - BrowserModule, - ReactiveFormsModule // <-- #2 add to @NgModule imports - ], declarations: [ AppComponent, HeroDetailComponent, // #enddocregion v1 - HeroListComponent + HeroListComponent // <--declare HeroListComponent // #docregion v1 ], -// #enddocregion v1 - exports: [ // export for the DemoModule + // #enddocregion hero-service-list + imports: [ + BrowserModule, + ReactiveFormsModule // <-- #2 add to @NgModule imports + ], + // #enddocregion v1 + // export for the DemoModule + // #docregion hero-service-list + // ... + exports: [ AppComponent, HeroDetailComponent, - HeroListComponent + HeroListComponent // <-- export HeroListComponent ], - providers: [ HeroService ], // <-- #4 provide HeroService + providers: [ HeroService ], // <-- provide HeroService +// #enddocregion hero-service-list // #docregion v1 bootstrap: [ AppComponent ] }) diff --git a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html index 1e98354842524..79410c4a6d68e 100644 --- a/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html +++ b/aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html @@ -1,7 +1,7 @@

Hero Detail

FormControl in a FormGroup

-
+