Report the stable publish before the rc parity copy, and quiet the copy
The fast-ring replication announced itself before the release that triggered it, so chat read as though an rc job had run on its own — the reverse of what happened. The publish report now fires first, and the replication says only how many packages were kept in parity: the release report immediately above it already lists them by name.
This commit is contained in:
+8
-2
@@ -346,10 +346,16 @@ if ((COPIED > 0)); then
|
|||||||
done <<<"$COPIED_FILES"
|
done <<<"$COPIED_FILES"
|
||||||
((COPIED > shown)) && moved+="<br>• …and $((COPIED - shown)) more"
|
((COPIED > shown)) && moved+="<br>• …and $((COPIED - shown)) more"
|
||||||
|
|
||||||
|
if [[ "$FAST_RING_ONLY" == true ]]; then
|
||||||
|
# Parity replication rides along with a stable release, which has already
|
||||||
|
# reported these exact packages. Repeating the list would double every
|
||||||
|
# fast-ring release in chat, so this is a one-liner.
|
||||||
|
notify_info "Kept $TO in parity: $COPIED fast-ring package(s) from $FROM" \
|
||||||
|
"Arch: $ARCH · the same artifacts just published to $FROM"
|
||||||
|
else
|
||||||
label="Promoted $FROM → $TO"
|
label="Promoted $FROM → $TO"
|
||||||
[[ "$BOOTSTRAP" == true ]] && label="Bootstrapped the $TO channel from $FROM"
|
[[ "$BOOTSTRAP" == true ]] && label="Bootstrapped the $TO channel from $FROM"
|
||||||
[[ "$FAST_RING_ONLY" == true ]] && label="Replicated fast-ring $FROM → $TO"
|
|
||||||
|
|
||||||
notify_info "$label" \
|
notify_info "$label" \
|
||||||
"Arch: $ARCH · $(hostname -s 2>/dev/null || echo host)<br><strong>$COPIED package(s) moved:</strong>$moved<br><br>Live at https://pkgs.omarchy.org/$TO/$ARCH/"
|
"Arch: $ARCH · $(hostname -s 2>/dev/null || echo host)<br><strong>$COPIED package(s) moved:</strong>$moved<br><br>Live at https://pkgs.omarchy.org/$TO/$ARCH/"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
+20
-20
@@ -198,6 +198,26 @@ fi
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
duration=$(format_duration $(($(date +%s) - RELEASE_STARTED_AT)))
|
||||||
|
summary="$RELEASE_CONTEXT<br>Duration: $duration"
|
||||||
|
if ((BUILT_COUNT > 0)); then
|
||||||
|
summary+="<br><br><strong>$BUILT_COUNT package(s) published:</strong>"
|
||||||
|
summary+="$(format_package_list_html "$BUILT_FILES")"
|
||||||
|
summary+="<br><br>Live at https://pkgs.omarchy.org/$MIRROR/$ARCH/"
|
||||||
|
notify_success "Release published: $MIRROR" "$summary"
|
||||||
|
else
|
||||||
|
# Rare by construction: a release only runs when the version check queued
|
||||||
|
# work, so publishing nothing means the check and the builder disagreed
|
||||||
|
# about what needs building. Worth reporting for exactly that reason — if
|
||||||
|
# these start recurring, something is flagging a package that never builds.
|
||||||
|
summary+="<br>No packages needed building — the version check and the"
|
||||||
|
summary+=" builder disagree about what is out of date."
|
||||||
|
if [[ -n "$QUEUED_PACKAGES" && "$QUEUED_PACKAGES" != "0" ]]; then
|
||||||
|
summary+="<br>Queued but not built: $(head -25 "$QUEUE_FILE" | tr '\n' ' ' | basecamp_html_escape)"
|
||||||
|
fi
|
||||||
|
notify_info "Release ran with nothing to publish: $MIRROR" "$summary"
|
||||||
|
fi
|
||||||
|
|
||||||
# Step 7 (stable only): fast-ring packages publish to rc and stable together,
|
# Step 7 (stable only): fast-ring packages publish to rc and stable together,
|
||||||
# so rc never falls behind what stable users actually run. Skipped until the
|
# so rc never falls behind what stable users actually run. Skipped until the
|
||||||
# rc channel has been bootstrapped.
|
# rc channel has been bootstrapped.
|
||||||
@@ -220,23 +240,3 @@ fi
|
|||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
print_success "Release workflow completed successfully!"
|
print_success "Release workflow completed successfully!"
|
||||||
|
|
||||||
duration=$(format_duration $(($(date +%s) - RELEASE_STARTED_AT)))
|
|
||||||
summary="$RELEASE_CONTEXT<br>Duration: $duration"
|
|
||||||
if ((BUILT_COUNT > 0)); then
|
|
||||||
summary+="<br><br><strong>$BUILT_COUNT package(s) published:</strong>"
|
|
||||||
summary+="$(format_package_list_html "$BUILT_FILES")"
|
|
||||||
summary+="<br><br>Live at https://pkgs.omarchy.org/$MIRROR/$ARCH/"
|
|
||||||
notify_success "Release published: $MIRROR" "$summary"
|
|
||||||
else
|
|
||||||
# Rare by construction: a release only runs when the version check queued
|
|
||||||
# work, so publishing nothing means the check and the builder disagreed
|
|
||||||
# about what needs building. Worth reporting for exactly that reason — if
|
|
||||||
# these start recurring, something is flagging a package that never builds.
|
|
||||||
summary+="<br>No packages needed building — the version check and the"
|
|
||||||
summary+=" builder disagree about what is out of date."
|
|
||||||
if [[ -n "$QUEUED_PACKAGES" && "$QUEUED_PACKAGES" != "0" ]]; then
|
|
||||||
summary+="<br>Queued but not built: $(head -25 "$QUEUE_FILE" | tr '\n' ' ' | basecamp_html_escape)"
|
|
||||||
fi
|
|
||||||
notify_info "Release ran with nothing to publish: $MIRROR" "$summary"
|
|
||||||
fi
|
|
||||||
|
|||||||
Reference in New Issue
Block a user