| |
@@ -38,15 +38,12 @@
|
| |
fi
|
| |
|
| |
# Set up our fedmsg function, using the releng repo definition
|
| |
- fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
| |
- fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
| |
FEDMSG_MODNAME="compose"
|
| |
FEDMSG_CERTPREFIX="releng"
|
| |
. ./releng/scripts/fedmsg-functions.sh
|
| |
|
| |
- # Announce that we are starting...
|
| |
- send_fedmsg "${fedmsg_json_start}" ${DIST} start
|
| |
-
|
| |
+ # Announce that we are starting, even though we don't know the compose_id yet..
|
| |
+ send_fedmsg $(printf '{"log": "start", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH") ${DIST} start
|
| |
|
| |
pushd $TMPDIR
|
| |
git clone https://git.fedorahosted.org/git/comps.git && {
|
| |
@@ -74,6 +71,8 @@
|
| |
|
| |
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-/COMPOSE_ID)
|
| |
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
| |
+ fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
|
| |
+ fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
|
| |
|
| |
compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
|
| |
/usr/share/mash/spam-o-matic $DESTDIR/compose/Everything/ >$DESTDIR/logs/depcheck
|
| |
ralph
commented 7 years ago
At the request of @adamwill.