Skip to content

Commit 35480f5

Browse files
authored
Merge branch 'angular:master' into fix-accessibility-table-examples
2 parents 21c1079 + 9ad184d commit 35480f5

File tree

1,002 files changed

+32837
-21064
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,002 files changed

+32837
-21064
lines changed

.bazelignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
node_modules
22

3+
integration/harness-e2e-cli/.angular
4+
integration/harness-e2e-cli/node_modules
5+
36
integration/ng-update-v13/.angular
47
integration/ng-update-v13/node_modules
58

.bazelrc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,18 @@ build:remote --auth_enabled=true
8686
# is provided by the shared dev-infra package and targets k8 remote containers.
8787
build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
8888
build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
89-
build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
90-
build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
91-
build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
89+
build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
90+
build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
91+
build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
92+
93+
################################
94+
# Sandbox settings #
95+
################################
96+
97+
# By default, network access should be disabled unless explicitly granted for certain targets
98+
# using the `requires-network` tag. https://docs.bazel.build/versions/main/be/common-definitions.html
99+
build --sandbox_default_allow_network=false
100+
test --sandbox_default_allow_network=false
92101

93102
################################
94103
# --config=build-results #

.bazelversion

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

.circleci/config.yml

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ var_11: &yarn_install_loose_lockfile
6767
var_12: &setup_bazel_ci_config
6868
run:
6969
name: "Setting up Bazel configuration for CI"
70-
command: |
71-
echo "import %workspace%/.circleci/bazel.rc" >> ./.bazelrc
70+
# Note: We add the remote config flag to the user bazelrc file that is not tracked
71+
# by Git. This is necessary to avoid stamping builds with `.with-local-changes`.
72+
command: echo "import %workspace%/.circleci/bazel.rc" >> ./.bazelrc.user
7273

7374
# Attaches the release output which has been stored in the workspace to the current job.
7475
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
@@ -103,7 +104,7 @@ var_15: &ignore_presubmit_branch_filter
103104
var_16: &setup_bazel_remote_execution
104105
run:
105106
name: "Setup bazel RBE remote execution"
106-
command: ./scripts/circleci/bazel/setup-remote-execution.sh
107+
command: ./scripts/bazel/setup-remote-execution.sh
107108

108109
# Sets up the bazel binary globally. We don't want to access bazel through Yarn and NodeJS
109110
# because it could mean that the Bazel child process only has access to limited memory.
@@ -472,7 +473,6 @@ jobs:
472473
- *yarn_install
473474
- *setup_bazel_binary
474475

475-
- run: yarn integration-tests:partial-ivy
476476
- run: yarn integration-tests
477477
- run:
478478
name: Running size integration tests (failures are reported in Slack only).
@@ -482,9 +482,47 @@ jobs:
482482
- *slack_notify_on_failure
483483

484484
# ----------------------------------------------------------------------------
485-
# Job that runs all integration tests against Angular snapshot builds.
485+
# Job that runs the AOT linker tests.
486486
# ----------------------------------------------------------------------------
487-
integration_tests_snapshot:
487+
linker_aot_test:
488+
<<: *job_defaults
489+
resource_class: xlarge
490+
environment:
491+
GCP_DECRYPT_TOKEN: *gcp_decrypt_token
492+
steps:
493+
- checkout_and_rebase
494+
- *restore_cache
495+
- *setup_bazel_ci_config
496+
- *setup_bazel_remote_execution
497+
- *yarn_install
498+
- *setup_bazel_binary
499+
500+
- run: yarn test-linker-aot
501+
- *slack_notify_on_failure
502+
503+
# ----------------------------------------------------------------------------
504+
# Job that runs the JIT linker tests.
505+
# ----------------------------------------------------------------------------
506+
linker_jit_test:
507+
<<: *job_defaults
508+
resource_class: xlarge
509+
environment:
510+
GCP_DECRYPT_TOKEN: *gcp_decrypt_token
511+
steps:
512+
- checkout_and_rebase
513+
- *restore_cache
514+
- *setup_bazel_ci_config
515+
- *setup_bazel_remote_execution
516+
- *yarn_install
517+
- *setup_bazel_binary
518+
519+
- run: yarn test-linker-jit
520+
- *slack_notify_on_failure
521+
522+
# ----------------------------------------------------------------------------
523+
# Job that runs both AOT and JIT linker tests against Angular snapshot builds.
524+
# ----------------------------------------------------------------------------
525+
snapshot_linker_tests:
488526
<<: *job_defaults
489527
resource_class: xlarge
490528
environment:
@@ -498,7 +536,8 @@ jobs:
498536
- *yarn_install_loose_lockfile
499537
- *setup_bazel_binary
500538

501-
- run: yarn integration-tests:partial-ivy
539+
- run: yarn test-linker-aot
540+
- run: yarn test-linker-jit
502541
- *slack_notify_on_failure
503542

504543
# ----------------------------------------------------------------------------
@@ -544,6 +583,10 @@ workflows:
544583
filters: *ignore_presubmit_branch_filter
545584
- integration_tests:
546585
filters: *ignore_presubmit_branch_filter
586+
- linker_aot_test:
587+
filters: *ignore_presubmit_branch_filter
588+
- linker_jit_test:
589+
filters: *ignore_presubmit_branch_filter
547590
- tests_local_browsers:
548591
filters: *ignore_presubmit_branch_filter
549592
- tests_browserstack:
@@ -578,7 +621,7 @@ workflows:
578621
filters: *only_main_branch_filter
579622
- mdc_snapshot_test_cronjob:
580623
filters: *only_main_branch_filter
581-
- integration_tests_snapshot:
624+
- snapshot_linker_tests:
582625
filters: *only_main_branch_filter
583626

584627
triggers:

.clang-format

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)