ci: re-enable the `@angular/components` unit tests (#41816)
Previously, the `components-repo-unit-tests` CI job was temporarily disabled due to a version mismatch between the `rules_nodejs` dependency version on the two repos (angular/angular and angular/components). Now that both repos have been updated to a `rules_nodejs` version >=2.0.0, we can re-enable the job and have `@angular/components` unit tests run on every build. PR Close #41816
This commit is contained in:
parent
044b380e5a
commit
641fa6944f
|
@ -36,7 +36,7 @@ var_4_win: &cache_key_win_fallback v4-angular-win-node-14-{{ checksum "month.txt
|
||||||
|
|
||||||
# Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
|
# 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.
|
# 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" }}-09e68db8ed5b1253f2fe38ff954ef0df019fc25a
|
var_5: &components_repo_unit_tests_cache_key v1-angular-components-{{ checksum "month.txt" }}-7cc42f5d835b7971e9ff73e220b801cf7834d515
|
||||||
var_6: &components_repo_unit_tests_cache_key_fallback v1-angular-components-{{ checksum "month.txt" }}
|
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` and
|
# Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
|
||||||
|
@ -722,11 +722,7 @@ jobs:
|
||||||
- run:
|
- run:
|
||||||
# Run yarn install to fetch the Bazel binaries as used in the components repo.
|
# Run yarn install to fetch the Bazel binaries as used in the components repo.
|
||||||
name: Installing dependencies.
|
name: Installing dependencies.
|
||||||
# TODO: remove this once the repo has been updated to use NodeJS v12 and Yarn 1.19.1.
|
command: yarn --cwd ${COMPONENTS_REPO_TMP_DIR} install --frozen-lockfile --non-interactive --cache-folder ~/.cache/yarn
|
||||||
# We temporarily ignore the "engines" because the Angular components repository has
|
|
||||||
# minimum dependency on NodeJS v12 and Yarn 1.19.1, but the framework repository uses
|
|
||||||
# older versions.
|
|
||||||
command: yarn --ignore-engines --cwd ${COMPONENTS_REPO_TMP_DIR} install --frozen-lockfile --non-interactive --cache-folder ~/.cache/yarn
|
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: *components_repo_unit_tests_cache_key
|
key: *components_repo_unit_tests_cache_key
|
||||||
paths:
|
paths:
|
||||||
|
@ -736,10 +732,14 @@ jobs:
|
||||||
- "/tmp/angular-components-repo"
|
- "/tmp/angular-components-repo"
|
||||||
- run:
|
- run:
|
||||||
# Updates the `angular/components` `package.json` file to refer to the release output
|
# Updates the `angular/components` `package.json` file to refer to the release output
|
||||||
# inside the `packages-dist` directory. Note that it's not necessary to perform a yarn
|
# inside the `packages-dist` directory.
|
||||||
# install as Bazel runs Yarn automatically when needed.
|
|
||||||
name: Setting up release packages.
|
name: Setting up release packages.
|
||||||
command: node scripts/ci/update-deps-to-dist-packages.js ${COMPONENTS_REPO_TMP_DIR}/package.json dist/packages-dist/
|
command: node scripts/ci/update-deps-to-dist-packages.js ${COMPONENTS_REPO_TMP_DIR}/package.json dist/packages-dist/
|
||||||
|
- run:
|
||||||
|
# Run `yarn install` again to install the Angular packages from `packages-dist/` and update the lockfile.
|
||||||
|
# NOTE: We cannot rely on Bazel to run `yarn install`, because it uses the `--frozen-lockfile` flag and fails.
|
||||||
|
name: Installing local Angular packages.
|
||||||
|
command: yarn --cwd ${COMPONENTS_REPO_TMP_DIR} install --non-interactive --cache-folder ~/.cache/yarn
|
||||||
- run:
|
- run:
|
||||||
name: "Running `angular/components` unit tests"
|
name: "Running `angular/components` unit tests"
|
||||||
command: ./scripts/ci/run_angular_components_unit_tests.sh
|
command: ./scripts/ci/run_angular_components_unit_tests.sh
|
||||||
|
@ -870,16 +870,9 @@ workflows:
|
||||||
- build-npm-packages
|
- build-npm-packages
|
||||||
- build-ivy-npm-packages
|
- build-ivy-npm-packages
|
||||||
- legacy-unit-tests-saucelabs
|
- legacy-unit-tests-saucelabs
|
||||||
# Temporarily disabled components-repo-unit-tests to update rules_nodejs to 2.0.0. Breaking changes in
|
- components-repo-unit-tests:
|
||||||
# rules_nodejs create a dependency sandwich between angular/angular & angular/components that are very
|
requires:
|
||||||
# difficult and time consuming to resolve and involve patching @angular/bazel in components repo such
|
- build-npm-packages
|
||||||
# as https://github.com/angular/components/commit/9e7ba251207df77164d73d66620e619bcbc4d2ad. It is simpler to
|
|
||||||
# 1) land angular/angular upgrade to rule_nodejs 2.0.0 which has breaking changes
|
|
||||||
# 2) land angular/components upgrade to rules_nodejs 2.0.0 using the @angular/bazel builds snapshot
|
|
||||||
# 3) update angular/angular to the landed components commit and re-enable these tests
|
|
||||||
# - components-repo-unit-tests:
|
|
||||||
# requires:
|
|
||||||
# - build-npm-packages
|
|
||||||
- test_zonejs:
|
- test_zonejs:
|
||||||
requires:
|
requires:
|
||||||
- setup
|
- setup
|
||||||
|
|
|
@ -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_URL "https://github.com/angular/components.git"
|
||||||
setPublicVar COMPONENTS_REPO_BRANCH "master"
|
setPublicVar COMPONENTS_REPO_BRANCH "master"
|
||||||
# **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`.
|
# **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`.
|
||||||
setPublicVar COMPONENTS_REPO_COMMIT "09e68db8ed5b1253f2fe38ff954ef0df019fc25a"
|
setPublicVar COMPONENTS_REPO_COMMIT "7cc42f5d835b7971e9ff73e220b801cf7834d515"
|
||||||
|
|
||||||
|
|
||||||
####################################################################################################
|
####################################################################################################
|
||||||
|
|
Loading…
Reference in New Issue