Skip to content

chore(backmerge): sync develop with master after v1.1.0 release - #42

Merged
SHcommit merged 3 commits into
developfrom
chore/backmerge-v1.1.0
Sep 6, 2026
Merged

chore(backmerge): sync develop with master after v1.1.0 release#42
SHcommit merged 3 commits into
developfrom
chore/backmerge-v1.1.0

Conversation

@SHcommit

@SHcommit SHcommit commented Sep 6, 2026

Copy link
Copy Markdown
Owner

Summary\n\nBack-merge from master to develop after the v1.1.0 release (PR #39 + tag v1.1.0), per AGENTS.md Git Flow ("Release branches merge into master and back into develop"). Brings develop up to master HEAD 71afafc (Merge PR #39).\n\n## What is in this back-merge\n\nThis is a no-ff merge of origin/master into a branch off develop:\n\n- 71afafc Merge pull request #39 from SHcommit/release/v1.1.0\n- 55650d7 chore(release): bump VERSION to 1.1.0 and sync manifests for v1.1.0 release\n\nFile diff vs develop (7 files, +91/-50):\n\n- skills/adr-toolkit/VERSION → 1.1.0\n- skills/adr-toolkit/SKILL.md frontmatter version → 1.1.0\n- .claude-plugin/plugin.json version → 1.1.0\n- adapters/gemini-cli/gemini-extension.json version → 1.1.0\n- adapters/antigravity/plugin.json version → 1.1.0\n- changelog.md new ## v1.1.0 (2026-09-06) section\n- handoff.md updated for the release flow\n\n## Release state\n\n- Tag v1.1.0 is on master at 71afafc (https://github.com/SHcommit/ADR-toolkit/releases/tag/v1.1.0).\n- The release.yml workflow ran successfully and published a GitHub Release with the skill tarball adr-toolkit-skill-v1.1.0.tar.gz + sha256 and Python wheel/sdist.\n- Known issue (follow-up): the Python wheel/sdist are named adr_toolkit-1.0.1-* because pyproject.toml version field is not in scripts/sync_version.py MANIFEST_SPECS scope. The skill tarball version is correct (1.1.0). A follow-up release (v1.1.1 hotfix) should add pyproject.toml to the sync scope and correct the wheel/sdist version.\n- Known issue (follow-up): claude plugin marketplace add /path/to/ADR-toolkit fails on Claude Code v2.1.263 because .claude-plugin/marketplace.json is missing the required owner field (and likely $schema + top-level description) that Anthropic-Code marketplace schema requires (compare Agent-toolkit/.claude-plugin/marketplace.json). This blocks installing the Claude Code plugin locally until fixed.\n\n## Why a PR (not direct push)\n\ndevelop and master are protected by repository rulesets — direct pushes are declined (already encountered when trying to push the release branch). A short-lived chore/* branch is the allowed path. Delete after merge per AGENTS.md.\n\n## Verification\n\n- git status clean before tagging.\n- git merge --no-ff origin/master produced commit 447ffd8d8d57f0b1d77dfced97f1320e23bd2b77 on chore/backmerge-v1.1.0.\n- No code changes beyond the version metadata already on master.\n\n## Examples Impact\n\n- [x] N/A — back-merge PR (chore(backmerge):), no examples/ change.\n\n## ADR Impact\n\n- [x] N/A — back-merge of an already-released release, no new architectural decision.\n

SHcommit and others added 3 commits September 6, 2026 17:48
…elease

Cut release v1.1.0 from develop. The 31 commits accumulated since v1.0.1
include six feat: commits (Cline CLI adapter, GitHub label taxonomy /
labeler / dependabot / Issue Forms / auto-triage), so SemVer requires a
MINOR bump; no breaking changes were identified.

sync_version.py propagated the bump across:
- skills/adr-toolkit/VERSION
- skills/adr-toolkit/SKILL.md (frontmatter version line)
- .claude-plugin/plugin.json
- adapters/gemini-cli/gemini-extension.json
- adapters/antigravity/plugin.json

(adapters/codex/.codex-plugin/plugin.json carries description only; no
version field to sync.)

changelog.md moves the Unreleased block under a new ## v1.1.0 (2026-09-06)
heading summarizing the 31 commits. handoff.md describes the release flow
per AGENTS.md: release/v1.1.0 merges into master, then back-merges into
develop, then v1.1.0 is tagged from master.

Verification: scripts/sync_version.py --check passes (no drift, no untracked
manifests).
chore(release): bump VERSION to 1.1.0 and sync manifests for v1.1.0 release
@github-actions github-actions Bot added type:docs Documentation only area:adapter adapters/** and .claude-plugin/** harness integrations area:docs docs/**, README, CONTRIBUTING, and other project documentation labels Sep 6, 2026
@SHcommit
SHcommit merged commit f944e4f into develop Sep 6, 2026
15 checks passed
@SHcommit
SHcommit deleted the chore/backmerge-v1.1.0 branch September 6, 2026 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:adapter adapters/** and .claude-plugin/** harness integrations area:docs docs/**, README, CONTRIBUTING, and other project documentation type:docs Documentation only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant