From e0cf3181e8319b1657ed3f39524dd4b6b3c7a7a5 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Mon, 6 Jun 2016 20:38:20 +0200 Subject: travis: fix changed_abuilds() to ignore deleted APKBUILDs --- .travis/build-pkgs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to '.travis/build-pkgs') diff --git a/.travis/build-pkgs b/.travis/build-pkgs index 75fc4446744..c3f2bb79e29 100755 --- a/.travis/build-pkgs +++ b/.travis/build-pkgs @@ -22,9 +22,10 @@ changed_abuilds() { local repo="$1" local commit_ish="$2" - # Get names of repo's subdirectories with modified APKBUILD. - local aports="$(git diff-tree -r --relative="$repo" --name-only "$commit_ish" -- '*APKBUILD' \ - | xargs -I% dirname % | xargs)" + # Get names of repo's subdirectories with modified APKBUILD, + # but ignore deleted ones. + local aports="$(git diff-tree -r --relative="$repo" --name-only --diff-filter=ACMR \ + "$commit_ish" -- '*APKBUILD' | xargs -I% dirname % | xargs)" # Sort abuilds by build order. ap builddirs -d "$(pwd)/$repo" $aports 2>/dev/null | xargs -I% basename % -- cgit v1.2.3