Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/buzz-acp-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ name: Publish buzz-acp
#
# buzz-acp.source (optional, `owner/repo@ref`) overrides WHERE the source comes
# from — a fork carrying a change upstream has not merged yet (block/buzz#6088,
# #774). When it is present the version is only the release name; delete the
# file and set the version back to an upstream tag once the change ships.
# #774). When it is present the version is only the release name. **#776 says
# when it is safe to delete the file and repin to an upstream tag, and how.**

on:
workflow_dispatch:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
version="$(tr -d '[:space:]' < buzz-acp.version)"
echo "version=${version}" >> "$GITHUB_OUTPUT"
if [ -s buzz-acp.source ]; then
source="$(tr -d '[:space:]' < buzz-acp.source)"
source="$(grep -v '^#' buzz-acp.source | tr -d '[:space:]')"
echo "repository=${source%@*}" >> "$GITHUB_OUTPUT"
echo "ref=${source##*@}" >> "$GITHUB_OUTPUT"
else
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ upgrade, is in
— `buzz-acp`, on every hosted deploy — lands back on the same conversation
and sandbox. The hosted `buzz-acp` is built from a fork carrying the
upstream change that sends the channel id (block/buzz#6088;
`buzz-acp.source`) until it merges.
`buzz-acp.source`) until it merges — #776 tracks the repin.

### Fixed

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH="${TARGETARCH:-amd64}" \
# The pin lives in buzz-acp.version and is passed as BUZZ_ACP_VERSION by the
# build workflow; the default below keeps a local `docker build` working.
# (buzz-acp.source may point the publish workflow at a fork — the version is
# then only the release name; see that workflow.)
# then only the release name; see that workflow. #776 tracks repinning to
# upstream once block/buzz#6088 ships.)

FROM debian:trixie-slim AS buzzacp
ARG TARGETARCH
Expand Down
1 change: 1 addition & 0 deletions buzz-acp.source
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# Fork pin — see #776 for when and how to remove. Format: owner/repo@ref
jhgaylor/buzz@83eda69a99fad02bc3cdf60d61ad14e56a41447e
Loading