Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 177b597

Browse files
author
Zhicheng WANG
committedMay 26, 2021
Merge branch 'master' of github.com:angular/components
# Conflicts: # guides/bidirectionality.md # guides/creating-a-custom-form-field-control.md # guides/creating-a-custom-stepper-using-the-cdk-stepper.md # guides/customizing-component-styles.md # guides/elevation.md # guides/getting-started.md # guides/schematics.md # guides/theming-your-components.md # guides/theming.md # guides/typography.md # guides/using-component-harnesses.md # guides/v9-hammerjs-migration.md # src/cdk/a11y/a11y.md # src/cdk/a11y/fake-mousedown.ts # src/cdk/a11y/focus-trap/configurable-focus-trap-config.ts # src/cdk/a11y/focus-trap/focus-trap.md # src/cdk/a11y/focus-trap/focus-trap.ts # src/cdk/a11y/key-manager/list-key-manager.ts # src/cdk/a11y/live-announcer/live-announcer.md # src/cdk/accordion/accordion-item.ts # src/cdk/bidi/dir.ts # src/cdk/clipboard/copy-to-clipboard.ts # src/cdk/collections/recycle-view-repeater-strategy.ts # src/cdk/collections/selection-model.ts # src/cdk/drag-drop/directives/drag-handle.ts # src/cdk/drag-drop/directives/drag.ts # src/cdk/drag-drop/directives/drop-list.ts # src/cdk/drag-drop/drag-drop.md # src/cdk/drag-drop/drag-ref.ts # src/cdk/drag-drop/drop-list-ref.ts # src/cdk/drag-drop/parent-position-tracker.ts # src/cdk/layout/breakpoints-observer.ts # src/cdk/observers/observe-content.ts # src/cdk/overlay/overlay-directives.ts # src/cdk/overlay/overlay-ref.ts # src/cdk/overlay/position/flexible-connected-position-strategy.ts # src/cdk/platform/features/shadow-dom.ts # src/cdk/portal/portal-directives.ts # src/cdk/schematics/ng-update/find-stylesheets.ts # src/cdk/schematics/utils/build-component.ts # src/cdk/schematics/utils/vendored-ast-utils/index.ts # src/cdk/scrolling/scroll-dispatcher.ts # src/cdk/scrolling/viewport-ruler.ts # src/cdk/scrolling/virtual-for-of.ts # src/cdk/scrolling/virtual-scroll-viewport.ts # src/cdk/stepper/stepper.ts # src/cdk/table/sticky-styler.ts # src/cdk/table/table.ts # src/cdk/testing/protractor/protractor-element.ts # src/cdk/testing/protractor/protractor-harness-environment.ts # src/cdk/testing/test-element.ts # src/cdk/testing/testbed/task-state-zone-interceptor.ts # src/cdk/text-field/autofill.ts # src/cdk/text-field/autosize.ts # src/cdk/tree/padding.ts # src/cdk/tree/tree.ts # src/google-maps/README.md # src/material/autocomplete/autocomplete-trigger.ts # src/material/autocomplete/autocomplete.ts # src/material/autocomplete/testing/autocomplete-harness.ts # src/material/badge/badge.md # src/material/button-toggle/button-toggle.ts # src/material/checkbox/testing/checkbox-harness.ts # src/material/chips/chip-input.ts # src/material/chips/chip-list.ts # src/material/datepicker/calendar-body.ts # src/material/datepicker/date-range-input.ts # src/material/datepicker/date-selection-model.ts # src/material/datepicker/datepicker-base.ts # src/material/datepicker/datepicker-input-base.ts # src/material/datepicker/datepicker-input.ts # src/material/datepicker/testing/datepicker-input-harness-base.ts # src/material/expansion/expansion-panel-header.ts # src/material/expansion/expansion-panel.ts # src/material/form-field/testing/form-field-harness.ts # src/material/list/list.ts # src/material/list/selection-list.ts # src/material/menu/menu-content.ts # src/material/menu/menu-trigger.ts # src/material/menu/menu.ts # src/material/menu/testing/menu-harness.ts # src/material/paginator/paginator.md # src/material/paginator/testing/paginator-harness.ts # src/material/radio/testing/radio-harness.ts # src/material/select/select.ts # src/material/select/testing/select-harness.ts # src/material/sidenav/drawer.ts # src/material/slide-toggle/testing/slide-toggle-harness.ts # src/material/snack-bar/snack-bar.md # src/material/snack-bar/snack-bar.ts # src/material/sort/sort-header-intl.ts # src/material/stepper/stepper.ts # src/material/table/table-data-source.ts # src/material/table/table.md # src/material/table/testing/cell-harness.ts # src/material/table/testing/row-harness.ts # src/material/table/testing/table-harness.ts # src/material/tabs/tab-body.ts # src/material/tooltip/testing/tooltip-harness.ts # src/material/tooltip/tooltip.md # src/material/tooltip/tooltip.ts # src/youtube-player/youtube-player.ts # tools/dgeni/templates/macros.html # tools/dgeni/templates/method.template.html
2 parents 6e0c280 + 94076af commit 177b597

File tree

1,328 files changed

+36875
-19470
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,328 files changed

+36875
-19470
lines changed
 

‎.bazelrc

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,8 @@ build:remote --project_id=internal-200822
7171
# Needed due to: https://github.com/bazelbuild/bazel/issues/7254
7272
build:remote --define=EXECUTOR=remote
7373

74-
# For remote execution, we use the `ubuntu16_04_clang` toolchain configurations. These only
75-
# support `k8` or `armeabi-v7a`. Since we run on remotely with `k8` containers, we need to
76-
# ensure that the proper CPU is configured so that the correct toolchain can be used.
77-
# https://github.com/bazelbuild/bazel-toolchains/blob/master/configs/ubuntu16_04_clang/10.0.0/bazel_2.1.0/cc/BUILD#L50
74+
# Since remote builds run within Google Cloud `k8`-based containers, we set the
75+
# host and target CPU accordingly.
7876
build:remote --cpu=k8
7977
build:remote --host_cpu=k8
8078

@@ -84,16 +82,12 @@ build:remote --remote_executor=remotebuildexecution.googleapis.com
8482
build:remote --auth_enabled=true
8583

8684
# Setup the toolchain and platform for the remote build execution. The platform
87-
# is automatically configured by the "rbe_autoconfig" rule in the project workpsace.
88-
build:remote --crosstool_top=@rbe_default//cc:toolchain
89-
build:remote --host_javabase=@rbe_default//java:jdk
90-
build:remote --javabase=@rbe_default//java:jdk
91-
build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
92-
build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
93-
build:remote --extra_execution_platforms=//tools:rbe_platform
94-
build:remote --host_platform=//tools:rbe_platform
95-
build:remote --platforms=//tools:rbe_platform
96-
build:remote --extra_toolchains=@rbe_default//config:cc-toolchain
85+
# is provided by the shared dev-infra package and targets k8 remote containers.
86+
build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
87+
build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
88+
build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
89+
build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
90+
build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
9791

9892
################################
9993
# --config=build-results #

‎.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.0
1+
4.0.0

0 commit comments

Comments
 (0)
Please sign in to comment.