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

Revert "revert: revert: ci(aio): exclude changes in aio/content folder" 

This reverts commit 3d85f72652.

Still causing repeated flakes on master.
This commit is contained in:
Alex Rickabaugh 2017-07-14 14:54:31 -07:00
parent 30e76fcd80
commit 97e6901ded
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
aio/scripts/payload.sh
View File

@ -45,15 +45,20 @@ timestamp=$(date +%s)
payloadData="$payloadData\"timestamp\": $timestamp, " payloadData="$payloadData\"timestamp\": $timestamp, "
# Add change source: application, dependencies, or 'application+dependencies' # Add change source: application, dependencies, or 'application+dependencies'
applicationChanges=$(git diff --name-only $TRAVIS_COMMIT_RANGE $parentDir | grep -v ${parentDir}/content | grep -v ${parentDir}/yarn.lock | wc -l) yarnChanged=false
dependencyChanges=$(git diff --name-only $TRAVIS_COMMIT_RANGE ${parentDir}/yarn.lock | wc -l) allChangedFiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE $parentDir | wc -l)
allChangedFileNames=$(git diff --name-only $TRAVIS_COMMIT_RANGE $parentDir)
if [[ $dependencyChanges -eq 1 ]] && [[ $applicationChanges -eq 0 ]]; then if [[ $allChangedFileNames == *"yarn.lock"* ]]; then
yarnChanged=true
fi
if [[ $allChangedFiles -eq 1 ]] && [[ "$yarnChanged" = true ]]; then
# only yarn.lock changed # only yarn.lock changed
change='dependencies' change='dependencies'
elif [[ $dependencyChanges -eq 1 ]] && [[ $applicationChanges -gt 0 ]]; then elif [[ $allChangedFiles -gt 1 ]] && [[ "$yarnChanged" = true ]]; then
change='application+dependencies' change='application+dependencies'
elif [[ $applicationChanges -gt 0 ]]; then elif [[ $allChangedFiles -gt 0 ]]; then
change='application' change='application'
else else
# Nothing changed in aio/ # Nothing changed in aio/