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

ci: do not cache modified "node_modules" in "material-unit-tests" job (#29416) 

Currently we cache the Material `node_modules` after
the `run_angular_material_unit_tests.sh` completed. This
means that the cache will incorrectly contain the Ivy NPM
package output which might be incompatible with the
other Material dependencies. e.g. the Material postinstall
command now uses a different NGC version that does not
work with the `typescript` version that has been specified in
the Material project.

PR Close #29416
This commit is contained in:
Paul Gschwendtner 2019-03-20 12:43:20 +01:00 committed by Kara Erickson
parent 2d7435daae
commit a530ed11e8
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.circleci/config.yml
View File

@ -581,16 +581,22 @@ jobs:
command: ./scripts/ci/clone_angular_material_repo.sh command: ./scripts/ci/clone_angular_material_repo.sh
- restore_cache: - restore_cache:
keys: keys:
- v1-angular-material-{{ checksum "material_repo_sha" }} - v2-angular-material-{{ checksum "material_repo_sha" }}
- v1-angular-material- - v2-angular-material-
- run: - run:
name: "Running Material unit tests" name: Installing Material dependencies.
command: ./scripts/ci/run_angular_material_unit_tests.sh command: yarn --cwd ${MATERIAL_REPO_TMP_DIR} install --frozen-lockfile --non-interactive
# Save the cache before we run the Material unit tests script. This is necessary
# because we don't want to cache the node modules which have been modified to contain
# the attached Ivy package output.
- save_cache: - save_cache:
key: v1-angular-material-{{ checksum "material_repo_sha" }} key: v2-angular-material-{{ checksum "material_repo_sha" }}
paths: paths:
# Needs to be hardcoded because environment variables are not interpolated here. # Needs to be hardcoded because environment variables are not interpolated here.
- "/tmp/material2/node_modules" - "/tmp/material2/node_modules"
- run:
name: "Running Material unit tests"
command: ./scripts/ci/run_angular_material_unit_tests.sh
workflows: workflows:
version: 2 version: 2

3
scripts/ci/run_angular_material_unit_tests.sh
View File

@ -9,9 +9,6 @@ angular_dir=$(pwd)
# Switch into Material directory. # Switch into Material directory.
cd ${MATERIAL_REPO_TMP_DIR} cd ${MATERIAL_REPO_TMP_DIR}
# Install dependencies for the freshly cloned repo.
yarn install --frozen-lockfile --non-interactive
# Install this version of Angular into the freshly cloned repo. # Install this version of Angular into the freshly cloned repo.
rm -rf ./node_modules/@angular/* rm -rf ./node_modules/@angular/*
cp -r ${angular_dir}/dist/packages-dist-ivy-aot/* ./node_modules/@angular/ cp -r ${angular_dir}/dist/packages-dist-ivy-aot/* ./node_modules/@angular/