diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-28 14:45:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-28 14:45:59 +0000 |
| commit | e4162e980cccf78e60acbbf1ec3f590637f5a3a8 (patch) | |
| tree | aa7bd7bcd8069fa32c9cb7a4f5790ee05357e591 | |
| parent | 44bfa2a383673db14dcc62cd55039938ac0e17e2 (diff) | |
| parent | 15772625adb04578ea27aecd40a9612dab492283 (diff) | |
Merge "adding a force-build-rpms check in the commit message"
| -rwxr-xr-x | ci/build.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ci/build.sh b/ci/build.sh index dd9f9fd1..fd079c91 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -113,7 +113,9 @@ 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) - if [[ $commit_file_list == *build/Makefile* ]]; then + if git show -s | grep "force-build-rpms"; then + MAKE_TARGETS+=" rpms" + elif [[ $commit_file_list == *build/Makefile* ]]; then # Makefile forces all rpms to be checked MAKE_TARGETS+=" rpms-check" else |