Skip to content

Commit adc5430

Browse files
alexeaglemhevery
authored andcommitted
test: make integration test more reliable (angular#14413)
Use a fresh yarn cache tsickle bugfix to write case-sensitive filenames for Mac
1 parent 0f161ce commit adc5430

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-23
lines changed

integration/run_tests.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ if [ ! -d "../dist/packages-dist-es2015" ]; then
1616
exit 1
1717
fi
1818

19+
# Workaround https://github.com/yarnpkg/yarn/issues/2165
20+
# Yarn will cache file://dist URIs and not update Angular code
21+
readonly cache=.yarn_local_cache
22+
function rm_cache {
23+
rm -rf $cache
24+
}
25+
rm_cache
26+
mkdir $cache
27+
trap rm_cache EXIT
28+
1929
for testDir in $(ls | grep -v rxjs | grep -v node_modules) ; do
2030
[[ -d "$testDir" ]] || continue
2131
echo "#################################"
@@ -25,7 +35,7 @@ for testDir in $(ls | grep -v rxjs | grep -v node_modules) ; do
2535
cd $testDir
2636
# Workaround for https://github.com/yarnpkg/yarn/issues/2256
2737
rm -f yarn.lock
28-
yarn
38+
yarn install --cache-folder ../$cache
2939
yarn test || exit 1
3040
)
3141
done

npm-shrinkwrap.clean.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-srcs",
3-
"version": "4.0.0-beta.6",
3+
"version": "4.0.0-beta.7",
44
"dependencies": {
55
"@types/angularjs": {
66
"version": "1.5.13-alpha",
@@ -6160,14 +6160,8 @@
61606160
}
61616161
},
61626162
"tsickle": {
6163-
"version": "0.21.1",
6164-
"dev": true,
6165-
"dependencies": {
6166-
"source-map": {
6167-
"version": "0.5.6",
6168-
"dev": true
6169-
}
6170-
}
6163+
"version": "0.21.2",
6164+
"dev": true
61716165
},
61726166
"tslint": {
61736167
"version": "4.1.1",

npm-shrinkwrap.json

Lines changed: 5 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)