Skip to content

[upstream-sync] Upstream sync — block/buzz@54c8ef3...19d57b0 (10 commits) - #12

Closed
github-actions[bot] wants to merge 1 commit into
mainfrom
upstream-sync-20260801-b289be7b8f9e0ba1
Closed

[upstream-sync] Upstream sync — block/buzz@54c8ef3...19d57b0 (10 commits)#12
github-actions[bot] wants to merge 1 commit into
mainfrom
upstream-sync-20260801-b289be7b8f9e0ba1

Conversation

@github-actions

@github-actions github-actions Bot commented Aug 1, 2026

Copy link
Copy Markdown

Merges 10 commits from block/buzz main into this fork.

Upstream range: 54c8ef30a...19d57b0d4

What changed upstream

Relay

Desktop

ACP

Mesh/compute

Release / CI

Docs

Conflicts

File Resolution
crates/buzz-core/src/kind.rs Kept upstream's KIND_PROJECT = 30621 and kept the fork-local KIND_STARKNET_WALLET_BINDING = 30900 block in its reserved position after the NIP-34 git kinds. Both constants are present.
crates/buzz-relay/src/handlers/ingest.rs Merged both import lists — upstream's KIND_PROJECT added alongside the fork's KIND_STARKNET_WALLET_BINDING.
desktop/src-tauri/tauri.conf.json Kept fork's productName: "BitcoinMarkets", took upstream's version: "0.5.3".

Needs a human look

  • kind.rs / ingest.rs: The new KIND_PROJECT = 30621 (NIP-MP multi-repo projects) has been integrated. Verify that the fork's KIND_STARKNET_WALLET_BINDING = 30900 ingest branch still handles attestation correctly alongside the new project kind, since both are now in the same import list.
  • tauri.conf.json: Version bumped to 0.5.3. The desktop release version in CHANGELOG.md and Info.plist should match; no further conflicts seen there.
  • release.yml: Upstream fix(release): require exact-head approval for desktop tags block/buzz#3973 and fix(release): preserve main in desktop PR body block/buzz#3979 touch release CI. This fork carries patches to release.yml — verify the resolved file still has the fork's RELEASE_REPO guard and github.repository-derived variables intact (those files merged cleanly, but worth a read).

Note: This PR was resolved by the agentic sync stage. The merge commit's second parent is dropped when gh-aw applies it as a patch, so the merge base does not advance. Re-merge upstream by hand after merging (git merge upstream/main on main) to keep the counter current.

Generated by Sync this fork with upstream · 70.5 AIC · ⌖ 19.5 AIC · ⊞ 7.9K ·

@adrienlacombe

Copy link
Copy Markdown
Owner

Closing in favour of a hand-merged branch that preserves upstream ancestry.

Two independent problems with this PR:

  1. Flattened merge. The head commit has 1 parent, not 2, and the branch does not contain upstream/main. Simulating the merge locally confirms that landing this leaves git rev-list --count upstream/main ^main at 10 — the merge base never advances, so the fork keeps reporting behind and the next sync re-resolves the same conflicts from the same stale base. This is the gh-aw patch-flattening failure documented in AGENTS.md.

  2. Red CI. Detect Changed Paths exits 126 — scripts/test-desktop-release-authorization.sh: Permission denied. Two new upstream scripts arrived with mode 100644 instead of upstream's 100755 (test-desktop-release-authorization.sh, verify-desktop-release-authorization.sh), so test-release-ref-contract.sh cannot execute them. They show as zero-line diffs.

Replacement branch has real two-parent ancestry, correct file modes, and merges the remaining upstream commits cleanly.

adrienlacombe added a commit that referenced this pull request Aug 1, 2026
The 2026-08-01 agentic sync PR (#12) delivered upstream's two new
desktop-release-authorization scripts at mode 100644 instead of 100755, so
test-release-ref-contract.sh could not execute them. Detect Changed Paths
exited 126 on 'Permission denied' and every downstream job skipped, which
reads as a broken sync rather than a lost file mode.

A mode-only change is a zero-line entry in git diff --stat, so it survives a
diff skim. Record the symptom and the ls-tree check so the next run does not
re-derive it from a red CI log.

Signed-off-by: adrienlacombe <6303520+adrienlacombe@users.noreply.github.com>
@adrienlacombe
adrienlacombe deleted the upstream-sync-20260801-b289be7b8f9e0ba1 branch August 3, 2026 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant