@@ -36,7 +36,7 @@ var_4_win: &cache_key_win_fallback v4-angular-win-node-12-{{ checksum "month.txt
3636
3737# Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
3838# cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable.
39- var_5 : &components_repo_unit_tests_cache_key v1-angular-components-{{ checksum "month.txt" }}-09e68db8ed5b1253f2fe38ff954ef0df019fc25a
39+ var_5 : &components_repo_unit_tests_cache_key v1-angular-components-{{ checksum "month.txt" }}-7cc42f5d835b7971e9ff73e220b801cf7834d515
4040var_6 : &components_repo_unit_tests_cache_key_fallback v1-angular-components-{{ checksum "month.txt" }}
4141
4242# Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
@@ -730,11 +730,7 @@ jobs:
730730 - run :
731731 # Run yarn install to fetch the Bazel binaries as used in the components repo.
732732 name : Installing dependencies.
733- # TODO: remove this once the repo has been updated to use NodeJS v12 and Yarn 1.19.1.
734- # We temporarily ignore the "engines" because the Angular components repository has
735- # minimum dependency on NodeJS v12 and Yarn 1.19.1, but the framework repository uses
736- # older versions.
737- command : yarn --ignore-engines --cwd ${COMPONENTS_REPO_TMP_DIR} install --frozen-lockfile --non-interactive --cache-folder ~/.cache/yarn
733+ command : yarn --cwd ${COMPONENTS_REPO_TMP_DIR} install --frozen-lockfile --non-interactive --cache-folder ~/.cache/yarn
738734 - save_cache :
739735 key : *components_repo_unit_tests_cache_key
740736 paths :
@@ -744,10 +740,14 @@ jobs:
744740 - " /tmp/angular-components-repo"
745741 - run :
746742 # Updates the `angular/components` `package.json` file to refer to the release output
747- # inside the `packages-dist` directory. Note that it's not necessary to perform a yarn
748- # install as Bazel runs Yarn automatically when needed.
743+ # inside the `packages-dist` directory.
749744 name : Setting up release packages.
750745 command : node scripts/ci/update-deps-to-dist-packages.js ${COMPONENTS_REPO_TMP_DIR}/package.json dist/packages-dist/
746+ - run :
747+ # Run `yarn install` again to install the Angular packages from `packages-dist/` and update the lockfile.
748+ # NOTE: We cannot rely on Bazel to run `yarn install`, because it uses the `--frozen-lockfile` flag and fails.
749+ name : Installing local Angular packages.
750+ command : yarn --cwd ${COMPONENTS_REPO_TMP_DIR} install --non-interactive --cache-folder ~/.cache/yarn
751751 - run :
752752 name : " Running `angular/components` unit tests"
753753 command : ./scripts/ci/run_angular_components_unit_tests.sh
@@ -890,16 +890,9 @@ workflows:
890890 - build-npm-packages
891891 - build-ivy-npm-packages
892892 - legacy-unit-tests-saucelabs
893- # Temporarily disabled components-repo-unit-tests to update rules_nodejs to 2.0.0. Breaking changes in
894- # rules_nodejs create a dependency sandwich between angular/angular & angular/components that are very
895- # difficult and time consuming to resolve and involve patching @angular/bazel in components repo such
896- # as https://github.com/angular/components/commit/9e7ba251207df77164d73d66620e619bcbc4d2ad. It is simpler to
897- # 1) land angular/angular upgrade to rule_nodejs 2.0.0 which has breaking changes
898- # 2) land angular/components upgrade to rules_nodejs 2.0.0 using the @angular/bazel builds snapshot
899- # 3) update angular/angular to the landed components commit and re-enable these tests
900- # - components-repo-unit-tests:
901- # requires:
902- # - build-npm-packages
893+ - components-repo-unit-tests :
894+ requires :
895+ - build-npm-packages
903896 - test_zonejs :
904897 requires :
905898 - setup
0 commit comments