diff --git a/.circleci/config.yml b/.circleci/config.yml index ffbb68ef0f5..6f89ce04d10 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,7 @@ var_4_win: &cache_key_win_fallback v5-angular-win-node-14-{{ checksum "month.txt # Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the # cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable. -var_5: &components_repo_unit_tests_cache_key v1-angular-components-{{ checksum "month.txt" }}-db18b4093f23ae5c0ef76f6a9699c670ee5d55f7 +var_5: &components_repo_unit_tests_cache_key v1-angular-components-{{ checksum "month.txt" }}-83da73fb621720fbe801d3a503d50fd82b3da0c8 var_6: &components_repo_unit_tests_cache_key_fallback v1-angular-components-{{ checksum "month.txt" }} # Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages`. @@ -878,11 +878,9 @@ workflows: # since the publishing script expects the legacy outputs layout. - build-npm-packages - legacy-unit-tests-saucelabs - # TODO(devversion): re-enable once the Angular components repo has been updated to deal - # with partial compilation APF v13 package output (i.e. with the linker processing). - #- components-repo-unit-tests: - # requires: - # - build-npm-packages + - components-repo-unit-tests: + requires: + - build-npm-packages - test_zonejs: requires: - setup diff --git a/.circleci/env.sh b/.circleci/env.sh index 504a99a41f1..d15d4422c00 100755 --- a/.circleci/env.sh +++ b/.circleci/env.sh @@ -74,7 +74,7 @@ setPublicVar COMPONENTS_REPO_TMP_DIR "/tmp/angular-components-repo" setPublicVar COMPONENTS_REPO_URL "https://github.com/angular/components.git" setPublicVar COMPONENTS_REPO_BRANCH "master" # **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`. -setPublicVar COMPONENTS_REPO_COMMIT "db18b4093f23ae5c0ef76f6a9699c670ee5d55f7" +setPublicVar COMPONENTS_REPO_COMMIT "83da73fb621720fbe801d3a503d50fd82b3da0c8" #################################################################################################### diff --git a/scripts/ci/run_angular_components_unit_tests.sh b/scripts/ci/run_angular_components_unit_tests.sh index e71c0caeba7..fe37024f060 100755 --- a/scripts/ci/run_angular_components_unit_tests.sh +++ b/scripts/ci/run_angular_components_unit_tests.sh @@ -15,4 +15,4 @@ cd ${COMPONENTS_REPO_TMP_DIR} # Now actually run the tests. The dev-app and all its subpackages are excluded as they fail # to compile due to limitations in Ivy's type checker (see FW-1352 and FW-1433) -bazel test --build_tag_filters=-docs-package,-e2e,-browser:firefox-local --test_tag_filters=-e2e,-browser:firefox-local --config=ivy -- src/... -src/dev-app/... +bazel test --build_tag_filters=-docs-package,-e2e,-browser:firefox-local --test_tag_filters=-e2e,-browser:firefox-local -- src/... -src/dev-app/...