Skip to content

Commit 847f2c5

Browse files
author
npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7
committed
Merge remote-tracking branch 'origin/main' into duncan/databricks-model-label-registry-sync
* origin/main: (39 commits) feat(relay): accept kind:30621 multi-repo projects at ingest (#3171) fix(release): preserve main in desktop PR body (#3979) chore(release): release Buzz Desktop version 0.5.3 (#3972) fix(release): require exact-head approval for desktop tags (#3973) fix(release): make desktop tagging squash-safe (#3965) Revert "chore(release): release Buzz Desktop version 0.5.3" (#3960) docs(nips): add single-coordinate manual-unread override layer and verification model to NIP-RS (#2864) chore(release): release Buzz Desktop version 0.5.3 fix(release): make immutable desktop release operable (#3943) feat(desktop): import local Pocket voices (#3259) fix(desktop): open profiles from avatars (#3751) refactor(voice): extract reusable Pocket primitives + Pocket voice settings (relands #2467 + #3208) (#3910) docs: add VISION_REMOTE_AGENTS.md (#3924) feat(desktop): auto-enable huddle transcription for agents (#3180) feat(agent): optional reply guard reminds a silent turn to publish (#3763) feat(desktop): upgrade Pocket TTS model (#3266) feat(desktop): delete a message by clearing its edit to empty (#3813) feat(relay): raise hosted community limit to five (#3829) feat(desktop): locally stored NIP-49 encrypted key backup (#2937) fix(catalog): update Amp tagline (#3806) ... Signed-off-by: npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7 <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>
2 parents 4d47f48 + cb9701c commit 847f2c5

290 files changed

Lines changed: 33210 additions & 5051 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/auto-tag-on-release-pr-merge.yml‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Auto-tag on Release PR Merge
44
# prefix; the main chart lane also auto-detects a Chart.yaml version bump so
55
# a chart feature PR can publish its own new version when merged:
66
#
7-
# version-bump/<v> → tag v<v> → release.yml (desktop app)
7+
# version-bump/<v> → tag desktop-v<v> → release.yml (desktop app)
88
# relay-release/<v> → tag relay-v<v> → docker.yml (relay image)
99
# chart-release/<v> → tag chart-v<v> → helm-chart.yml (main helm chart)
1010
# push-chart-release/<v> → tag push-chart-v<v> → push-gateway-helm-chart.yml
@@ -35,6 +35,11 @@ permissions:
3535

3636
jobs:
3737
auto-tag:
38+
permissions:
39+
contents: read
40+
pull-requests: read
41+
checks: read
42+
statuses: read
3843
if: >
3944
github.event.pull_request.merged == true &&
4045
github.event.pull_request.head.repo.full_name == github.repository
@@ -57,7 +62,7 @@ jobs:
5762
case "$BRANCH" in
5863
version-bump/*)
5964
VERSION="${BRANCH#version-bump/}"
60-
TAG_PREFIX="v" ;;
65+
TAG_PREFIX="desktop-v" ;;
6166
relay-release/*)
6267
VERSION="${BRANCH#relay-release/}"
6368
TAG_PREFIX="relay-v" ;;
@@ -85,9 +90,33 @@ jobs:
8590
{
8691
echo "enabled=true"
8792
echo "tag=${TAG_PREFIX}${VERSION}"
93+
if [[ "$TAG_PREFIX" == desktop-v ]]; then
94+
echo "target_sha=${{ github.event.pull_request.merge_commit_sha }}"
95+
echo "desktop=true"
96+
else
97+
echo "target_sha=$GITHUB_SHA"
98+
echo "desktop=false"
99+
fi
88100
} >> "$GITHUB_OUTPUT"
89101
echo "Tagging ${TAG_PREFIX}${VERSION}"
90102
103+
104+
- name: Verify immutable reviewed desktop candidate
105+
if: steps.release.outputs.desktop == 'true'
106+
env:
107+
GH_TOKEN: ${{ github.token }}
108+
VERSION: ${{ steps.release.outputs.tag }}
109+
PR_NUMBER: ${{ github.event.pull_request.number }}
110+
PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
111+
PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
112+
PR_BASE_REF: ${{ github.event.pull_request.base.ref }}
113+
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
114+
MERGE_SHA: ${{ github.event.pull_request.merge_commit_sha }}
115+
run: |
116+
VERSION="${VERSION#desktop-v}"
117+
export VERSION
118+
scripts/verify-desktop-release-merge.sh
119+
91120
- name: Create release tagger token
92121
if: steps.release.outputs.enabled == 'true'
93122
id: release-tagger
@@ -102,21 +131,22 @@ jobs:
102131
env:
103132
GH_TOKEN: ${{ steps.release-tagger.outputs.token }}
104133
TAG: ${{ steps.release.outputs.tag }}
134+
TARGET_SHA: ${{ steps.release.outputs.target_sha }}
105135
run: |
106136
set -euo pipefail
107137
# Check gh's exit status, not its output. A missing ref returns a 404
108138
# JSON body on stdout, which must not be mistaken for an existing tag.
109139
if gh api "repos/$GITHUB_REPOSITORY/git/ref/tags/$TAG" --silent 2>/dev/null; then
110140
EXISTING_SHA="$(gh api "repos/$GITHUB_REPOSITORY/commits/$TAG" --jq .sha)"
111-
if [ "$EXISTING_SHA" = "$GITHUB_SHA" ]; then
112-
echo "Tag $TAG already exists at $GITHUB_SHA — skipping tag creation"
141+
if [ "$EXISTING_SHA" = "$TARGET_SHA" ]; then
142+
echo "Tag $TAG already exists at $TARGET_SHA — skipping tag creation"
113143
exit 0
114144
else
115-
echo "::error::Tag $TAG already exists at $EXISTING_SHA (expected $GITHUB_SHA)"
145+
echo "::error::Tag $TAG already exists at $EXISTING_SHA (expected $TARGET_SHA)"
116146
exit 1
117147
fi
118148
fi
119149
gh api --method POST "repos/$GITHUB_REPOSITORY/git/refs" \
120150
-f ref="refs/tags/$TAG" \
121-
-f sha="$GITHUB_SHA" \
151+
-f sha="$TARGET_SHA" \
122152
--silent

‎.github/workflows/ci.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ jobs:
7676
- '.github/workflows/ci.yml'
7777
- name: Release workflow source contract
7878
run: scripts/test-release-ref-contract.sh
79+
- name: Desktop release candidate contract
80+
run: scripts/test-desktop-release-candidate.sh
7981
- name: Mobile release contract
8082
run: |
8183
scripts/test-mobile-release-contract.sh
@@ -702,6 +704,17 @@ jobs:
702704
--run-ignored ignored-only
703705
env:
704706
RELAY_URL: ws://localhost:3000
707+
- name: NIP-MP coordinate deletion guard
708+
# Verifies the never-delete-newer invariant of soft_delete_by_coordinate:
709+
# a stale tombstone (created_at earlier than the live head) spares that
710+
# head, and an equal-timestamp tombstone deletes it.
711+
run: |
712+
cargo nextest run \
713+
--archive-file target/ci/backend-integration-tests.tar.zst \
714+
-E 'package(buzz-db) and test(coordinate_delete_spares_head_newer_than_the_deletion)' \
715+
--run-ignored ignored-only
716+
env:
717+
DATABASE_URL: postgres://buzz:${{ env.BUZZ_TEST_POSTGRES_PASSWORD }}@localhost:5432/buzz
705718
- name: Upload relay log
706719
if: failure()
707720
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
@@ -737,7 +750,7 @@ jobs:
737750
./scripts/start-relay-for-tests.sh --no-build
738751
- name: Relay E2E tests
739752
run: |
740-
cargo test -p buzz-test-client --test e2e_persona --test e2e_nostr_interop -- --ignored --nocapture
753+
cargo test -p buzz-test-client --test e2e_persona --test e2e_team_catalog --test e2e_nostr_interop --test e2e_project -- --ignored --nocapture
741754
cargo test -p buzz-test-client --test e2e_relay invite -- --ignored --nocapture
742755
cargo test -p buzz-test-client --test e2e_relay nip43_membership_snapshots_are_rejected -- --ignored --nocapture
743756
env:
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Desktop Release Candidate
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
validate:
12+
name: Desktop Release Candidate
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
16+
with:
17+
ref: ${{ github.event.pull_request.head.sha }}
18+
fetch-depth: 0
19+
persist-credentials: false
20+
- name: Validate immutable desktop candidate
21+
if: startsWith(github.event.pull_request.head.ref, 'version-bump/')
22+
env:
23+
VERSION: ${{ github.event.pull_request.head.ref }}
24+
run: |
25+
VERSION="${VERSION#version-bump/}"
26+
scripts/desktop_release.py validate --candidate HEAD --version "$VERSION" --repo "$GITHUB_REPOSITORY"

0 commit comments

Comments
 (0)