Skip to content

Commit

Permalink
Merge branch 'angular:master' into fix-accessibility-table-examples
Browse files Browse the repository at this point in the history
  • Loading branch information
forsti0506 authored Feb 28, 2022
2 parents 21c1079 + 9ad184d commit 35480f5
Show file tree
Hide file tree
Showing 1,002 changed files with 32,837 additions and 21,064 deletions.
3 changes: 3 additions & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
node_modules

integration/harness-e2e-cli/.angular
integration/harness-e2e-cli/node_modules

integration/ng-update-v13/.angular
integration/ng-update-v13/node_modules

Expand Down
15 changes: 12 additions & 3 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,18 @@ build:remote --auth_enabled=true
# is provided by the shared dev-infra package and targets k8 remote containers.
build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
build:remote --extra_execution_platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network

################################
# Sandbox settings #
################################

# By default, network access should be disabled unless explicitly granted for certain targets
# using the `requires-network` tag. https://docs.bazel.build/versions/main/be/common-definitions.html
build --sandbox_default_allow_network=false
test --sandbox_default_allow_network=false

################################
# --config=build-results #
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.0
5.0.0
59 changes: 51 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ var_11: &yarn_install_loose_lockfile
var_12: &setup_bazel_ci_config
run:
name: "Setting up Bazel configuration for CI"
command: |
echo "import %workspace%/.circleci/bazel.rc" >> ./.bazelrc
# Note: We add the remote config flag to the user bazelrc file that is not tracked
# by Git. This is necessary to avoid stamping builds with `.with-local-changes`.
command: echo "import %workspace%/.circleci/bazel.rc" >> ./.bazelrc.user

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

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

- run: yarn integration-tests:partial-ivy
- run: yarn integration-tests
- run:
name: Running size integration tests (failures are reported in Slack only).
Expand All @@ -482,9 +482,47 @@ jobs:
- *slack_notify_on_failure

# ----------------------------------------------------------------------------
# Job that runs all integration tests against Angular snapshot builds.
# Job that runs the AOT linker tests.
# ----------------------------------------------------------------------------
integration_tests_snapshot:
linker_aot_test:
<<: *job_defaults
resource_class: xlarge
environment:
GCP_DECRYPT_TOKEN: *gcp_decrypt_token
steps:
- checkout_and_rebase
- *restore_cache
- *setup_bazel_ci_config
- *setup_bazel_remote_execution
- *yarn_install
- *setup_bazel_binary

- run: yarn test-linker-aot
- *slack_notify_on_failure

# ----------------------------------------------------------------------------
# Job that runs the JIT linker tests.
# ----------------------------------------------------------------------------
linker_jit_test:
<<: *job_defaults
resource_class: xlarge
environment:
GCP_DECRYPT_TOKEN: *gcp_decrypt_token
steps:
- checkout_and_rebase
- *restore_cache
- *setup_bazel_ci_config
- *setup_bazel_remote_execution
- *yarn_install
- *setup_bazel_binary

- run: yarn test-linker-jit
- *slack_notify_on_failure

# ----------------------------------------------------------------------------
# Job that runs both AOT and JIT linker tests against Angular snapshot builds.
# ----------------------------------------------------------------------------
snapshot_linker_tests:
<<: *job_defaults
resource_class: xlarge
environment:
Expand All @@ -498,7 +536,8 @@ jobs:
- *yarn_install_loose_lockfile
- *setup_bazel_binary

- run: yarn integration-tests:partial-ivy
- run: yarn test-linker-aot
- run: yarn test-linker-jit
- *slack_notify_on_failure

# ----------------------------------------------------------------------------
Expand Down Expand Up @@ -544,6 +583,10 @@ workflows:
filters: *ignore_presubmit_branch_filter
- integration_tests:
filters: *ignore_presubmit_branch_filter
- linker_aot_test:
filters: *ignore_presubmit_branch_filter
- linker_jit_test:
filters: *ignore_presubmit_branch_filter
- tests_local_browsers:
filters: *ignore_presubmit_branch_filter
- tests_browserstack:
Expand Down Expand Up @@ -578,7 +621,7 @@ workflows:
filters: *only_main_branch_filter
- mdc_snapshot_test_cronjob:
filters: *only_main_branch_filter
- integration_tests_snapshot:
- snapshot_linker_tests:
filters: *only_main_branch_filter

triggers:
Expand Down
14 changes: 0 additions & 14 deletions .clang-format

This file was deleted.

Loading

0 comments on commit 35480f5

Please sign in to comment.