diff options
| author |   Michael Chapman <michapma@redhat.com> | 2016-07-08 02:20:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-08 02:20:55 +0000 |
| commit | 1895dcd2fa7d6888b5e451b229b213954f923de5 (patch) | |
| tree | 4c475f090fa6718645211c7e6ca91be8a1dae7f4 | |
| parent | 771d5a58883f1fcb89507c503b1ef13524610a93 (diff) | |
| parent | 169bcc4f01feeb02599b3c81e146b120fd5ed9a7 (diff) | |
Merge "forcing rpm-check if files added to the commit"
| -rwxr-xr-x | ci/build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/build.sh b/ci/build.sh index fd079c91..af065b11 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -112,10 +112,10 @@ fi # Conditionally execute RPM build checks if the specs change and target is not rpm or iso if [[ "$MAKE_TARGETS" == "images" ]]; then - commit_file_list=$(git show --pretty="format:" --name-only) + commit_file_list=$(git show --pretty="format:" --name-status) if git show -s | grep "force-build-rpms"; then MAKE_TARGETS+=" rpms" - elif [[ $commit_file_list == *build/Makefile* ]]; then + elif [[ $commit_file_list == *"A$(printf '\t')"* || $commit_file_list == *build/Makefile* ]]; then # Makefile forces all rpms to be checked MAKE_TARGETS+=" rpms-check" else |