jerry/buzz
1
0
Fork 0
mirror of https://github.com/block/buzz.git synced 2026-11-05 17:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use immutable commit-SHA URLs in screenshot PR comments (#842)

Browse Source
This commit is contained in:
Will Pfleger
2026-06-03 22:28:11 -04:00
committed by GitHub
parent 3b78dc5690
commit 2a0572c0d8
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AGENTS.md
View File

@@ -292,8 +292,9 @@ just desktop-screenshot --name copy-hover \
Available mock channels: `general`, `random`, `design`, `sales`, `engineering`, Available mock channels: `general`, `random`, `design`, `sales`, `engineering`,
`agents`, `watercooler`, `announcements`, `alice-tyler`, `bob-tyler`. `agents`, `watercooler`, `announcements`, `alice-tyler`, `bob-tyler`.
`scripts/post-screenshots.sh` hosts PNGs on a per-developer orphan branch `scripts/post-screenshots.sh` hosts PNGs on a per-developer branch
(`agent-screenshots/<github-username>`) and posts a PR comment: (`agent-screenshots/<github-username>`) and posts a PR comment with
commit-SHA-based image URLs (immutable — safe from later overwrites):
```bash ```bash
./scripts/post-screenshots.sh 803 test-results/screenshots ./scripts/post-screenshots.sh 803 test-results/screenshots

18
scripts/post-screenshots.sh
View File

@@ -18,7 +18,6 @@ fi
GH_USER=$(gh api user --jq .login) GH_USER=$(gh api user --jq .login)
BRANCH="agent-screenshots/${GH_USER}" BRANCH="agent-screenshots/${GH_USER}"
REPO="block/sprout" REPO="block/sprout"
RAW_BASE="https://raw.githubusercontent.com/${REPO}/refs/heads/${BRANCH}"
mapfile -t PNGS < <(find "$PNG_DIR" -maxdepth 1 -name "*.png" -type f | sort) mapfile -t PNGS < <(find "$PNG_DIR" -maxdepth 1 -name "*.png" -type f | sort)
if [[ ${#PNGS[@]} -eq 0 ]]; then if [[ ${#PNGS[@]} -eq 0 ]]; then
@@ -32,7 +31,7 @@ if git fetch origin "refs/heads/${BRANCH}:refs/remotes/origin/${BRANCH}" 2>/dev/
fi fi
NEW_ENTRIES="" NEW_ENTRIES=""
IMAGE_URLS=() TREE_PATHS=()
for PNG in "${PNGS[@]}"; do for PNG in "${PNGS[@]}"; do
FILENAME=$(basename "$PNG") FILENAME=$(basename "$PNG")
if ! [[ "$FILENAME" =~ ^[a-zA-Z0-9_.-]+$ ]]; then if ! [[ "$FILENAME" =~ ^[a-zA-Z0-9_.-]+$ ]]; then
@@ -42,19 +41,28 @@ for PNG in "${PNGS[@]}"; do
BLOB=$(git hash-object -w "$PNG") BLOB=$(git hash-object -w "$PNG")
TREE_PATH="pr-${PR}--${FILENAME}" TREE_PATH="pr-${PR}--${FILENAME}"
NEW_ENTRIES+="$(printf '100644 blob %s\t%s' "$BLOB" "$TREE_PATH")"$'\n' NEW_ENTRIES+="$(printf '100644 blob %s\t%s' "$BLOB" "$TREE_PATH")"$'\n'
IMAGE_URLS+=("${RAW_BASE}/${TREE_PATH}") TREE_PATHS+=("$TREE_PATH")
done done
COMBINED=$(printf '%s\n' "$EXISTING_ENTRIES" "$NEW_ENTRIES" | grep -v '^$') COMBINED=$(printf '%s\n' "$EXISTING_ENTRIES" "$NEW_ENTRIES" | grep -v '^$')
TREE=$(echo "$COMBINED" | git mktree) TREE=$(echo "$COMBINED" | git mktree)
COMMIT=$(git commit-tree "$TREE" -m "screenshots: PR #${PR}") PARENT_ARGS=()
if git rev-parse "origin/${BRANCH}" >/dev/null 2>&1; then
PARENT_ARGS=(-p "origin/${BRANCH}")
fi
COMMIT=$(git commit-tree "$TREE" "${PARENT_ARGS[@]}" -m "screenshots: PR #${PR}")
git push --force-with-lease origin "${COMMIT}:refs/heads/${BRANCH}" git push --force-with-lease origin "${COMMIT}:refs/heads/${BRANCH}"
RAW_BASE="https://raw.githubusercontent.com/${REPO}/${COMMIT}"
declare -A IMAGE_URL_MAP declare -A IMAGE_URL_MAP
IMAGE_URLS=()
for i in "${!PNGS[@]}"; do for i in "${!PNGS[@]}"; do
ORIG_NAME="$(basename "${PNGS[$i]}" .png)" ORIG_NAME="$(basename "${PNGS[$i]}" .png)"
IMAGE_URL_MAP["$ORIG_NAME"]="${IMAGE_URLS[$i]}" URL="${RAW_BASE}/${TREE_PATHS[$i]}"
IMAGE_URLS+=("$URL")
IMAGE_URL_MAP["$ORIG_NAME"]="$URL"
done done
if [[ -n "$BODY_FILE" ]]; then if [[ -n "$BODY_FILE" ]]; then