From f97d7ab84fd3c0d87e46c9c08f3932ff57c5c3e7 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 12 Feb 2021 11:13:03 +0100 Subject: Retrigger full CI when drone.yml was changed Signed-off-by: Vincent Petry --- tests/drone-run-acceptance-tests.sh | 4 +++- tests/drone-run-integration-tests.sh | 4 +++- tests/drone-run-php-tests.sh | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/drone-run-acceptance-tests.sh b/tests/drone-run-acceptance-tests.sh index df5ac683b..beec7f6ef 100755 --- a/tests/drone-run-acceptance-tests.sh +++ b/tests/drone-run-acceptance-tests.sh @@ -8,7 +8,9 @@ echo "=========================" [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | wc -l) -eq 0 ]] && echo "No files are modified => merge commit" && exit 0 -[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep "appinfo/info.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0 +[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c "\.drone\.yml") -gt 0 ]] && echo ".drone.yml is modified" && exit 0 + +[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c "appinfo/info\.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0 [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep --invert-match "^tests/" | grep -c ".php$") -gt 0 ]] && echo "PHP files are modified" && exit 0 diff --git a/tests/drone-run-integration-tests.sh b/tests/drone-run-integration-tests.sh index 3b9dffd11..d92737e97 100755 --- a/tests/drone-run-integration-tests.sh +++ b/tests/drone-run-integration-tests.sh @@ -8,7 +8,9 @@ echo "=========================" [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | wc -l) -eq 0 ]] && echo "No files are modified => merge commit" && exit 0 -[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep "appinfo/info.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0 +[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c '^\.drone\.yml$') -gt 0 ]] && echo ".drone.yml is modified" && exit 0 + +[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c "appinfo/info\.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0 [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep --invert-match "^tests/" | grep -c ".php$") -gt 0 ]] && echo "PHP files are modified" && exit 0 diff --git a/tests/drone-run-php-tests.sh b/tests/drone-run-php-tests.sh index 4a60cc66f..f6af87f2a 100755 --- a/tests/drone-run-php-tests.sh +++ b/tests/drone-run-php-tests.sh @@ -1,5 +1,4 @@ #!/bin/bash - echo "=========================" echo "= List of changed files =" echo "=========================" @@ -8,7 +7,9 @@ echo "=========================" [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | wc -l) -eq 0 ]] && echo "No files are modified => merge commit" && exit 0 -[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep "appinfo/info.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0 +[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c '^\.drone\.yml$') -gt 0 ]] && echo ".drone.yml is modified" && exit 0 + +[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c "appinfo/info\.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0 [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep --invert-match "^tests/" | grep -c ".php$") -gt 0 ]] && echo "PHP files are modified" && exit 0 -- cgit v1.2.3