Repository navigation
Commit 3ce7c8a
committed
Merge upstream block/buzz into main, with a real second parent
PR #7 landed upstream's *content* but not its history. gh-aw's
create-pull-request safe output ships the agent's work as a git patch
(`/tmp/gh-aw/aw-*.patch`, upstream-sync.lock.yml:1040), and a patch cannot
carry a merge commit's second parent. So b111a7b arrived with a single
parent despite its "Merge remote-tracking branch 'upstream/main'" subject,
the merge base stayed at 63496cc, and GitHub kept reporting this fork 23
commits behind while those commits' changes were already in the tree.
This is a real `git merge upstream/main`, so the merge base finally advances.
Future syncs become incremental instead of re-resolving the same conflicts
against a stale base every night.
Three files conflicted, all already on the fork-local patch list:
- desktop/src-tauri/src/lib.rs — both sides inserted a `mod` after
`mod huddle;`: ours `linux_media` via the flattened patch, upstream
`key_backup`. Union, alphabetical order kept.
- Cargo.lock — `rlp` is fork-local and sits immediately before `rmcp`, which
upstream touched. Pure union, checked with `cargo metadata --locked`.
- .github/workflows/release.yml — see below.
Two regressions the auto-merge introduced silently, both in release.yml, and
neither raised as a conflict:
1. `assemble-manifest`'s gate. Upstream block#3568 added
`needs.release.result == 'success'` plus the same for
`release-macos-x64`. Both jobs are pinned to `block/buzz` and so always
report `skipped` here, making the gate unsatisfiable in a fork — the exact
failure 67917a9 fixed, where every updater archive and .sig uploaded and
only latest.json was missing. Git saw no conflict because our side had
*removed* a condition while upstream *added* these. Re-patched to accept
either darwin-aarch64 lane and to tolerate `skipped` only for the signed
x64 lane, so on block/buzz every lane must still succeed.
2. `release-macos-unsigned` was stranded on the pre-block#3568 release model.
Upstream moved every platform lane to handing assemble-manifest a
`desktop-release-*` workflow artifact; this lane is fork-local, so neither
the restructure nor the `v` -> `desktop-v` tag rename reached it. Left
alone it would `gh release upload` to a `v${VERSION}` tag that is no
longer created, and its updater archive would never reach `staged` —
leaving the fork's only darwin-aarch64 asset out of both the release and
latest.json, which is the failure this lane exists to prevent. Ported to
upload-artifact, tag prefix corrected, and `contents` dropped to `read`
now that it touches no release.
Verified: `cargo check --manifest-path desktop/src-tauri/Cargo.toml
--all-targets` clean, `cargo metadata --locked` clean, release.yml parses,
and the fork-local relay allowlist, productName, APP_DISPLAY_NAME, app_name,
GHCR overrides and mesh-llm-rev patches all survived the merge.
Signed-off-by: adrienlacombe <[email protected]>70 files changed
Lines changed: 6142 additions & 524 deletions
File tree
- .github/workflows
- desktop
- src-tauri
- src
- assets
- commands
- personas/snapshot
- team_snapshot
- huddle
- relay
- src
- app
- features
- channels
- ui
- messages
- lib
- ui
- onboarding/ui
- settings
- lib
- ui
- testing
- tests
- e2e
- helpers
- helpers
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
38 | 43 | | |
39 | 44 | | |
40 | 45 | | |
| |||
57 | 62 | | |
58 | 63 | | |
59 | 64 | | |
60 | | - | |
| 65 | + | |
61 | 66 | | |
62 | 67 | | |
63 | 68 | | |
| |||
85 | 90 | | |
86 | 91 | | |
87 | 92 | | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
88 | 100 | | |
89 | 101 | | |
90 | 102 | | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
91 | 121 | | |
92 | 122 | | |
93 | 123 | | |
| |||
102 | 132 | | |
103 | 133 | | |
104 | 134 | | |
| 135 | + | |
105 | 136 | | |
106 | 137 | | |
107 | 138 | | |
108 | 139 | | |
109 | 140 | | |
110 | 141 | | |
111 | | - | |
112 | | - | |
| 142 | + | |
| 143 | + | |
113 | 144 | | |
114 | 145 | | |
115 | | - | |
| 146 | + | |
116 | 147 | | |
117 | 148 | | |
118 | 149 | | |
119 | 150 | | |
120 | 151 | | |
121 | | - | |
| 152 | + | |
122 | 153 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
| 79 | + | |
| 80 | + | |
79 | 81 | | |
80 | 82 | | |
81 | 83 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
0 commit comments