Skip to content

Fix OpenCode patch drift check#37

Merged
luckeyfaraday merged 1 commit into
mainfrom
fix/patch-drift-upstream-head
Jun 29, 2026
Merged

Fix OpenCode patch drift check#37
luckeyfaraday merged 1 commit into
mainfrom
fix/patch-drift-upstream-head

Conversation

@luckeyfaraday

Copy link
Copy Markdown
Owner

Summary

  • Narrow patch hunks so the Athena patch applies after upstream import/context drift.
  • Preserve compatibility with the pinned OpenCode build revision and upstream HEAD.

Verification

  • sed 's/\\r$//' patches/opencode-athena.patch | git -C /tmp/athena-patch-upstream apply --check - against upstream HEAD c3637753
  • same patch check against failed-run upstream commit 48fc9e3c
  • same patch check against pinned build revision 4ecc3ac
  • bash -n scripts/build.sh scripts/install.sh
  • npx --yes [email protected] test test
  • git diff --check

@luckeyfaraday luckeyfaraday merged commit 208c6a1 into main Jun 29, 2026
2 checks passed
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