Merge branch 'master' into perf-focusmonitor-ngzone

Author: mleibman

.bazel_fix_commands.json

@@ -0,0 +1 @@
+[]

.bazelrc

@@ -21,6 +21,11 @@ test --nolegacy_external_runfiles
 # when running bazel via `yarn bazel`.
 build --incompatible_strict_action_env
 
+# Do not build runfile forests by default. If an execution strategy relies on runfile
+# forests, the forest is created on-demand. See: https://github.com/bazelbuild/bazel/issues/6627
+# and https://github.com/bazelbuild/bazel/commit/03246077f948f2790a83520e7dccc2625650e6df
+build --nobuild_runfile_links
+
 ###############################
 # Output control              #
 ###############################
@@ -32,16 +37,20 @@ query --output=label_kind
 # By default, failing tests don't print any output, it goes to the log file
 test --test_output=errors
 
-#################################
-# Release configuration.        #
-# Run with "--config=release"   #
-#################################
+####################################
+# Stamping configurations.         #
+# Run with "--config=release" or   #
+# "--config=snapshot-build".       #
+####################################
 
 # Configures script to do version stamping.
 # See https://docs.bazel.build/versions/master/user-manual.html#flag--workspace_status_command
 build:release --workspace_status_command="node ./tools/bazel-stamp-vars.js"
 build:release --stamp
 
+build:snapshot-build --workspace_status_command="node ./tools/bazel-stamp-vars.js --snapshot"
+build:snapshot-build --stamp
+
 ################################
 # View Engine / Ivy toggle     #
 ################################
@@ -51,20 +60,6 @@ build:ivy --define=angular_ivy_enabled=True
 # Set Ivy as the default
 build --config=ivy
 
-#######################
-# Remote HTTP Caching #
-#######################
-build --remote_http_cache=https://storage.googleapis.com/angular-team-cache
-build --remote_accept_cached=true
-build --remote_upload_local_results=false
-
-######################################
-# Remote HTTP Caching writes support #
-# Turn on these settings with        #
-#  --config=-http-caching            #
-######################################
-build:remote-http-caching --remote_upload_local_results=true
-
 ################################
 # Remote Execution Setup       #
 ################################
@@ -76,6 +71,13 @@ build:remote --project_id=internal-200822
 # Needed due to: https://github.com/bazelbuild/bazel/issues/7254
 build:remote --define=EXECUTOR=remote
 
+# For remote execution, we use the `ubuntu16_04_clang` toolchain configurations. These only
+# support `k8` or `armeabi-v7a`. Since we run on remotely with `k8` containers, we need to
+# ensure that the proper CPU is configured so that the correct toolchain can be used.
+# https://github.com/bazelbuild/bazel-toolchains/blob/master/configs/ubuntu16_04_clang/10.0.0/bazel_2.1.0/cc/BUILD#L50
+build:remote --cpu=k8
+build:remote --host_cpu=k8
+
 # Setup the remote build execution servers.
 build:remote --remote_cache=remotebuildexecution.googleapis.com
 build:remote --remote_executor=remotebuildexecution.googleapis.com
@@ -94,10 +96,18 @@ build:remote --host_platform=//tools:rbe_platform
 build:remote --platforms=//tools:rbe_platform
 build:remote --extra_toolchains=@rbe_default//config:cc-toolchain
 
-# Setup Build Event Service
-build:remote --bes_backend=buildeventservice.googleapis.com
-build:remote --bes_timeout=30s
-build:remote --bes_results_url="https://source.cloud.google.com/results/invocations/"
+################################
+# --config=build-results       #
+################################
+
+# Sets up Build Event Service if the `builds-results` configuration is used. We
+# do not upload build results by default as this makes us reliant on external servers
+# that could cause builds to fail unnecessarily. If desired, build result uploading
+# can be manually uploaded, but given that the build event service server has been
+# less stable than the remote executors, we do not want to degrade CI stability.
+build:build-results --bes_backend=buildeventservice.googleapis.com
+build:build-results --bes_timeout=60s
+build:build-results --bes_results_url="https://source.cloud.google.com/results/invocations/"
 
 # Set remote caching settings
 build:remote --remote_accept_cached=true
@@ -116,7 +126,3 @@ test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test
 # Load any settings which are specific to the current user. Needs to be *last* statement
 # in this config, as the user configuration should be able to overwrite flags from this file.
 try-import .bazelrc.user
-
-# TODO: check if we can enable these deprecations.
-build --incompatible_new_actions_api=false
-build --incompatible_no_support_tools_in_action_inputs=false

.bazelversion

@@ -1 +1 @@
-2.1.0
+3.1.0