[OE-core] [RFC PATCH 1/2] classes/buildhistory: add new output history collection class
Koen Kooi
koen at dominion.thruhere.net
Wed Dec 7 08:50:51 UTC 2011
Op 2 dec. 2011, om 00:56 heeft Paul Eggleton het volgende geschreven:
>
> +buildhistory_commit() {
> + ( cd ${BUILDHISTORY_DIR}/
> + git add ${BUILDHISTORY_DIR}/*
> + git commit ${BUILDHISTORY_DIR}/ -m "Build ${BUILDNAME} for machine ${MACHINE} configured for ${DISTRO} ${DISTRO_VERSION}" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null
> + if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then
> + git push -q ${BUILDHISTORY_PUSH_REPO}
> + fi) || true
> +}
One of the big problems with the old testlab code was that using multiple buildslaves created a huge mess for the git repo. What do you think about doing this the following before the 'git add'?
git pull -q -s recursive -X theirs ${BUILDHISTORY_PULL_REPO}
I'm not sure what the right incantation is to ensure git updates the current branch, but the point is mainly about using the 'theirs' strategy.
regards,
Koen
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20111207/aa26ec06/attachment-0002.sig>
More information about the Openembedded-core
mailing list