Merge branch 'angular:main' into main

.bazelignore

@@ -6,7 +6,6 @@
 node_modules
 dist
 aio/node_modules
-aio/content/example-playground
 aio/tools/examples/shared/node_modules
 aio/tools/examples/shared/example-scaffold
 
@@ -37,3 +36,4 @@ integration/typings_test_rxjs7/node_modules
 integration/typings_test_ts49/node_modules
 integration/typings_test_ts50/node_modules
 integration/typings_test_ts51/node_modules
+integration/typings_test_ts52/node_modules

.bazelrc

@@ -1,6 +1,10 @@
 # Enable debugging tests with --config=debug
 test:debug --test_arg=--node_options=--inspect-brk --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results
 
+# Do not attempt to de-flake locally.
+# On CI we might set this to `3` to run with deflaking.
+test --flaky_test_attempts=1
+
 ###############################
 # Filesystem interactions     #
 ###############################
@@ -108,9 +112,10 @@ build:remote --define=EXECUTOR=remote
 # Set a higher timeout value, just in case.
 build:remote --remote_timeout=600
 
-# Increase the default number of jobs by 50% because our build has lots of
-# parallelism
-build:remote --jobs=150
+# Bazel detects maximum number of jobs based on host resources.
+# Since we run remotely, we can increase this number significantly.
+common:remote --jobs=200
+
 build:remote --google_default_credentials
 
 # Limit the number of test jobs for on an AIO local deps build. The example tests running
@@ -130,10 +135,16 @@ build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:pla
 
 # Remote instance and caching
 build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance
-build:remote --project_id=internal-200822
+build:remote --bes_instance_name=internal-200822
 build:remote --remote_cache=remotebuildexecution.googleapis.com
 build:remote --remote_executor=remotebuildexecution.googleapis.com
 
+# Use HTTP remote cache
+build:remote-cache --remote_cache=https://storage.googleapis.com/angular-team-cache
+build:remote-cache --remote_accept_cached=true
+build:remote-cache --remote_upload_local_results=true
+build:remote-cache --google_default_credentials
+
 # Ensure that tags like "no-remote-exec" get propagated to actions created by rules,
 # even if the rule implementation does not explicitly pass them to the execution requirements.
 # https://bazel.build/reference/command-line-reference#flag--experimental_allow_tags_propagation

.circleci/bazel.common.rc

@@ -6,7 +6,8 @@
 build --announce_rc
 
 # Retry in the event of flakes, eg. https://circleci.com/gh/angular/angular/31309
-test --flaky_test_attempts=2
+# By default this is set in the project `.bazelrc` to `1`.
+test --flaky_test_attempts=3
 
 # More details on failures
 build --verbose_failures=true