Skip to content

Sync our Lemonade fork with upstream daily - #25

Merged
bong-water-water-bong merged 1 commit into
mainfrom
sync-lemonade-fork
Sep 23, 2026
Merged

bong-water-water-bong merged 1 commit into
mainfrom
sync-lemonade-fork

Conversation

@bong-water-water-bong

Copy link
Copy Markdown
Collaborator

Adds .github/workflows/sync-lemonade-fork.yml, which runs daily and on demand:

  • Merge: merges upstream lemonade-sdk/lemonade main into our fork, 1bit-MONSTER/lemonade.
  • Clean merge: if it still registers onebit, it's pushed to the fork's main.
  • Conflicts: a sync/<sha> branch and a PR in the fork list the conflicting files. Nothing goes to upstream.
  • Workflows: it keeps every workflow in the fork disabled. Upstream's build, release, website and PPA workflows must not run from the fork, and I disabled all 25 today.

Tested:

  • Run against the real fork, the script takes the no-op path: the fork already contains upstream 3b5ec50.
  • With a simulated upstream commit, it merges, checks that onebit is still registered, and would push.

Needs: HRX_BUMP_TOKEN must also have Contents, Pull requests and Actions read/write on 1bit-MONSTER/lemonade.

🤖 Generated with Claude Code

.github/workflows/sync-lemonade-fork.yml merges lemonade-sdk/lemonade main
into 1bit-MONSTER/lemonade: a clean merge that still registers onebit is
pushed to the fork's main; a conflicting one becomes a sync/<sha> branch and
a PR in the fork listing the conflicts. It then disables every workflow in
the fork, since upstream's build/release/website/PPA workflows must not run
there (all 25 were disabled today).

Tested: the script against the real fork takes the no-op path (fork already
contains upstream 3b5ec50); with a simulated upstream commit it merges,
confirms onebit is still registered, and would push the merge.

Needs HRX_BUMP_TOKEN to have Contents, Pull requests and Actions read/write
on 1bit-MONSTER/lemonade too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@bong-water-water-bong
bong-water-water-bong enabled auto-merge (squash) September 23, 2026 23:02
@bong-water-water-bong
bong-water-water-bong merged commit 8f68b0a into main Sep 23, 2026
1 check passed
@bong-water-water-bong
bong-water-water-bong deleted the sync-lemonade-fork branch September 23, 2026 23:03
bong-water-water-bong pushed a commit that referenced this pull request Sep 27, 2026
… leaves open

Re-points third_party/llama.cpp from the PR head (53c0715) to the merge
commit of 1bit-MONSTER/llama.cpp#25 and regenerates registry/architectures.json
(the registry_pins check failed on the moved pin). docs/hrx.md: the merge
commit, and that the fix turns NaN router logits into a valid-but-wrong expert
instead of a fault; the NaN source stays open (#140), with the page-migration
measurement that points at it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
bong-water-water-bong pushed a commit that referenced this pull request Sep 27, 2026
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
bong-water-water-bong added a commit that referenced this pull request Sep 27, 2026
* hrx: bump llama.cpp for the MoE router expert-id fault fix (#123)

Pins third_party/llama.cpp at the fix for engine#123: router_top8_f32 could
publish its 0x7FFFFFFF no-winner seed as an expert id, which
qwen3_moe_routed_gate_up_swiglu_q4k_q8 then turned into a wild weight address
(HSA_STATUS_ERROR_MEMORY_FAULT / llama_decode ret=-3). Upstream PR:
1bit-MONSTER/llama.cpp#25

Re-point at the merge commit once #25 lands.

* hrx: pin llama.cpp at the #25 merge (895d63f); registry; what the fix leaves open

Re-points third_party/llama.cpp from the PR head (53c0715) to the merge
commit of 1bit-MONSTER/llama.cpp#25 and regenerates registry/architectures.json
(the registry_pins check failed on the moved pin). docs/hrx.md: the merge
commit, and that the fix turns NaN router logits into a valid-but-wrong expert
instead of a fault; the NaN source stays open (#140), with the page-migration
measurement that points at it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* registry: regenerate for llama.cpp 895d63f (the #25 merge commit)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: bong-water-water-bong <bong-water-water-bong@1bit.gg>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant