honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: update material-unit-test commit (#33073) 

Updates the `material-unit-test` job to run tests against
the latest commit of the Angular Components repository.

The components repository updated to rules_nodejs#0.38.2 before Angular Bazel did.
To do this, the `@angular/bazel` v0.38.2 compatibility changes were patched on postinstall.

This now conflicts because we install a `@angular/bazel` version in the `material-unit-tests` job
that already includes these compatibility changes. This would result in the patch being a noop
for which the `patch` command throws an error.

We can remove this once components can install a released version of `@angular/bazel` that is
compatible with `rules_nodejs#0.38.2`.

PR Close #33073
This commit is contained in:
Greg Magolan 2019-10-10 15:23:45 -07:00 committed by Miško Hevery
parent 0004896ff9
commit dcbc3b197d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -29,7 +29,7 @@ var_4_win: &cache_key_win_fallback v5-angular-win-node-12.0-
# Cache key for the Material unit tests job. **Note** when updating the SHA in the cache keys,
# also update the SHA for the "MATERIAL_REPO_COMMIT" environment variable.
var_5: &material_unit_tests_cache_key v4-angular-material-361d1cf800641a6e77321c5d43d97ed854310b9a
var_5: &material_unit_tests_cache_key v4-angular-material-d4bf7be64b03a2cfdaaf6f045cfc7c72de6470c2
var_6: &material_unit_tests_cache_key_fallback v4-angular-material-
# Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and

2
.circleci/env.sh
View File

@ -84,7 +84,7 @@ setPublicVar MATERIAL_REPO_TMP_DIR "/tmp/material2"
setPublicVar MATERIAL_REPO_URL "https://github.com/angular/material2.git"
setPublicVar MATERIAL_REPO_BRANCH "master"
# **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI "config.yml".
setPublicVar MATERIAL_REPO_COMMIT "361d1cf800641a6e77321c5d43d97ed854310b9a"
setPublicVar MATERIAL_REPO_COMMIT "d4bf7be64b03a2cfdaaf6f045cfc7c72de6470c2"
# Source `$BASH_ENV` to make the variables available immediately.
source $BASH_ENV;

6
scripts/ci/run_angular_material_unit_tests.sh
View File

@ -14,13 +14,13 @@ angular_dir=$(pwd)
sed -i'.bak' "s/\(_ENABLE_NG_TYPE_CHECKING = \)True/\1False/g" ${MATERIAL_REPO_TMP_DIR}/tools/defaults.bzl
sed -i'.bak' "s/\(\"ivyTemplateTypeCheck\": \)False/\1True/g" dist/packages-dist-ivy-aot/bazel/src/ng_module.bzl
# The components repository updated to rules_nodejs#0.38.0 before Angular Bazel did. To do this,
# the `@angular/bazel` v0.38.0 compatibility changes were patched on postinstall. This now
# The components repository updated to rules_nodejs#0.38.2 before Angular Bazel did. To do this,
# the `@angular/bazel` v0.38.2 compatibility changes were patched on postinstall. This now
# conflicts because we install a `@angular/bazel` version that already includes these compatibility
# changes. This would result in the patch being a noop for which the `patch` command throws.
# To work around this temporarily, we just ensure that the patch does not run on postinstall.
# TODO: remove this once Angular components no longer needs the postinstall patch.
sed -i -r "s/shelljs.cat.+angular_bazel_0\.38\.0\.patch.+;//g" ${MATERIAL_REPO_TMP_DIR}/tools/bazel/postinstall-patches.js
sed -i -r "s/shelljs.cat.+angular_bazel_0\.38\.2\.patch.+;//g" ${MATERIAL_REPO_TMP_DIR}/tools/bazel/postinstall-patches.js
# Switch into Material directory.
cd ${MATERIAL_REPO_TMP_DIR}