From 1bf7ba87a0275022877bc87e9a1615327726d25c Mon Sep 17 00:00:00 2001 From: Yuan Gao Date: Fri, 30 Jun 2017 10:08:33 -0700 Subject: [PATCH] ci(aio): exclude changes in aio/content folder --- aio/scripts/payload.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/aio/scripts/payload.sh b/aio/scripts/payload.sh index 73fb472894..1cf2f669b5 100755 --- a/aio/scripts/payload.sh +++ b/aio/scripts/payload.sh @@ -43,20 +43,15 @@ timestamp=$(date +%s) payloadData="$payloadData\"timestamp\": $timestamp, " # Add change source: application, dependencies, or 'application+dependencies' -yarnChanged=false -allChangedFiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE $parentDir | wc -l) -allChangedFileNames=$(git diff --name-only $TRAVIS_COMMIT_RANGE $parentDir) +applicationChanges=$(git diff --name-only $TRAVIS_COMMIT_RANGE $parentDir | grep -v ${parentDir}/content | grep -v ${parentDir}/yarn.lock | wc -l) +dependencyChanges=$(git diff --name-only $TRAVIS_COMMIT_RANGE ${parentDir}/yarn.lock | wc -l) -if [[ $allChangedFileNames == *"yarn.lock"* ]]; then - yarnChanged=true -fi - -if [[ $allChangedFiles -eq 1 ]] && [[ "$yarnChanged" = true ]]; then +if [[ $dependencyChanges -eq 1 ]] && [[ $applicationChanges -eq 0 ]]; then # only yarn.lock changed change='dependencies' -elif [[ $allChangedFiles -gt 1 ]] && [[ "$yarnChanged" = true ]]; then +elif [[ $dependencyChanges -eq 1 ]] && [[ $applicationChanges -gt 0 ]]; then change='application+dependencies' -elif [[ $allChangedFiles -gt 0 ]]; then +elif [[ $applicationChanges -gt 0 ]]; then change='application' else # Nothing changed in aio/