diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-08-26 15:01:45 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:36:09 +0100 |
commit | e6c330c7e59ee7d8753657321174cafc2f53a03c (patch) | |
tree | 7c6a51fba0b31ce0fa2b1167feae9e2c436fbc61 /meta/classes/buildhistory.bbclass | |
parent | 9badc1c640d356514f15ba6d34483e53ad6337c7 (diff) | |
download | poky-e6c330c7e59ee7d8753657321174cafc2f53a03c.tar.gz |
classes/buildhistory: ensure we push when "no changes" commits are made
If there aren't any changes, we still make a commit to the buildhistory
repo, but this wasn't being pushed if BUILDHISTORY_PUSH_REPO is set.
Move the push to the end to make it unconditional.
(From OE-Core rev: af2fc914975d06fdd75a65d4b00cf9f5c1610528)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index cad5116ed5..e60cdd72ba 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -621,11 +621,11 @@ END | |||
621 | git commit $entry metadata-revs -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" -m "cmd: $CMDLINE" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null | 621 | git commit $entry metadata-revs -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" -m "cmd: $CMDLINE" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null |
622 | done | 622 | done |
623 | git gc --auto --quiet | 623 | git gc --auto --quiet |
624 | if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then | ||
625 | git push -q ${BUILDHISTORY_PUSH_REPO} | ||
626 | fi | ||
627 | else | 624 | else |
628 | git commit ${BUILDHISTORY_DIR}/ --allow-empty -m "No changes: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" -m "cmd: $CMDLINE" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null | 625 | git commit ${BUILDHISTORY_DIR}/ --allow-empty -m "No changes: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" -m "cmd: $CMDLINE" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null |
626 | fi | ||
627 | if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then | ||
628 | git push -q ${BUILDHISTORY_PUSH_REPO} | ||
629 | fi) || true | 629 | fi) || true |
630 | } | 630 | } |
631 | 631 | ||