diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2016-06-06 20:38:20 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2016-06-07 12:19:23 +0200 |
| commit | e0cf3181e8319b1657ed3f39524dd4b6b3c7a7a5 (patch) | |
| tree | ec909e7f62bb4c1ad99dbe55c50bfeb2236c994e /.travis | |
| parent | a13b023b35017eee9a9a254429f0ac4d1850bf38 (diff) | |
| download | alpine_aports-e0cf3181e8319b1657ed3f39524dd4b6b3c7a7a5.tar.bz2 alpine_aports-e0cf3181e8319b1657ed3f39524dd4b6b3c7a7a5.tar.xz alpine_aports-e0cf3181e8319b1657ed3f39524dd4b6b3c7a7a5.zip | |
travis: fix changed_abuilds() to ignore deleted APKBUILDs
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/build-pkgs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis/build-pkgs b/.travis/build-pkgs index 75fc444674..c3f2bb79e2 100755 --- a/.travis/build-pkgs +++ b/.travis/build-pkgs | |||
| @@ -22,9 +22,10 @@ changed_abuilds() { | |||
| 22 | local repo="$1" | 22 | local repo="$1" |
| 23 | local commit_ish="$2" | 23 | local commit_ish="$2" |
| 24 | 24 | ||
| 25 | # Get names of repo's subdirectories with modified APKBUILD. | 25 | # Get names of repo's subdirectories with modified APKBUILD, |
| 26 | local aports="$(git diff-tree -r --relative="$repo" --name-only "$commit_ish" -- '*APKBUILD' \ | 26 | # but ignore deleted ones. |
| 27 | | xargs -I% dirname % | xargs)" | 27 | local aports="$(git diff-tree -r --relative="$repo" --name-only --diff-filter=ACMR \ |
| 28 | "$commit_ish" -- '*APKBUILD' | xargs -I% dirname % | xargs)" | ||
| 28 | 29 | ||
| 29 | # Sort abuilds by build order. | 30 | # Sort abuilds by build order. |
| 30 | ap builddirs -d "$(pwd)/$repo" $aports 2>/dev/null | xargs -I% basename % | 31 | ap builddirs -d "$(pwd)/$repo" $aports 2>/dev/null | xargs -I% basename % |