Skip to content

docs: document ZMK-matched branch/revision strategy - #10

Merged
jamescrosswell merged 1 commit into
v0.3.0from
docs/branch-versioning
Jun 29, 2026
Merged

jamescrosswell merged 1 commit into
v0.3.0from
docs/branch-versioning

Conversation

@jamescrosswell

Copy link
Copy Markdown
Contributor

Targets the new v0.3.0 branch (snapshot of main at ZMK v0.3.0), establishing the ZMK-mirrored branch strategy in the docs.

Why

oskey compiles against ZMK's internal behavior APIs, which change between ZMK versions. So each oskey branch must be built and tested against one specific ZMK revision, and users must pin matching revisions in their west.yml. ZMK uses a rolling main plus a branch per release; oskey now mirrors that:

oskey branch ZMK revision it targets
main ZMK main (unreleased — Zephyr 4.1, the future 0.4.0)
v0.3.0 ZMK v0.3.0 (latest stable release, Zephyr 3.5)

Changes

  • README — Installation: pin the manifest example to v0.3.0 for both zmk and oskey, and add a note (with a mapping table) making clear the oskey revision must match the zmk revision, and that mismatches are unsupported.
  • AGENTS.md: add a "Versioning & branches" section documenting the branch↔ZMK-revision mapping, where to send fixes, the tests/manifest/west.yml pin, the zmk-build-arm image/Zephyr correspondence, and the snapshot-on-release workflow.

Docs-only; no behavior or test changes. The companion forward-line work (moving main onto ZMK 4.1) is tracked separately in #9.

Pin the Installation manifest example to ZMK v0.3.0 (both zmk and oskey)
and explain that the oskey revision must match the zmk revision, since
oskey compiles against ZMK internal APIs that change between versions.

Add a "Versioning & branches" section to AGENTS.md describing the
ZMK-mirrored branch strategy: main tracks ZMK main, v0.3.0 tracks the
v0.3.0 release.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@jamescrosswell
jamescrosswell marked this pull request as ready for review June 29, 2026 08:41
@jamescrosswell
jamescrosswell merged commit 503b243 into v0.3.0 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