Skip to content

chore: make dev the only development branch and drop v1.8-dev references - #1608

Merged
lklimek merged 2 commits into
devfrom
chore/retire-versioned-dev-branches
Nov 10, 2026
Merged

lklimek merged 2 commits into
devfrom
chore/retire-versioned-dev-branches

Conversation

@Claudius-Maginificent

@Claudius-Maginificent Claudius-Maginificent commented Nov 10, 2026 •

Copy link
Copy Markdown
Collaborator

TL;DR: Makes dev the only development branch in agent instructions, contributor docs, release tooling and the RPC API description, and removes leftover references to retired vX.Y-dev branches.

User story

As a contributor or AI agent working on Tenderdash, I want every instruction and tool to point at dev, to avoid starting work from, or opening PRs against, a retired vX.Y-dev branch.

Scenario

Base flow

A contributor or agent starts a change, prepares a release, or reads the RPC API description.

Actual behavior

  • AGENTS.md and CONTRIBUTING.md call dev the integration branch, but also talk about choosing among "historical versioned" branches. Old vX.Y-dev branches still exist on the remote, and agents end up using them.
  • The release planner silently falls back to v1.8-dev when dev has not been fetched.
  • The docs builder links source files to v1.8-dev by default.
  • The RPC OpenAPI document gives its version as v1.8-dev and links the license on that branch.

Expected behavior

  • Instructions say plainly: branch from dev and open PRs into dev; only stable hotfixes start from master; vX.Y-dev branches are retired.
  • The release planner refuses to run without origin/dev.
  • The docs builder links to dev by default.
  • The OpenAPI document shows the real Tenderdash version, kept in step with each release.

Detailed discussion

What was done

  • AGENTS.md, CONTRIBUTING.md: require work on dev (stable hotfixes from master excepted); vX.Y-dev branches are retired and must not be branched from, targeted or compared against, even while they still exist on the remote.
  • scripts/release/plan.py: integration is always origin/dev; a missing origin/dev is an error instead of a fallback to origin/v1.8-dev.
  • scripts/prepare-docs.py: default --source-ref is dev (the Makefile still passes the exact HEAD SHA).
  • rpc/openapi/openapi.yaml: info.version is 2.0.0-dev.1 (TMVersionDefault); the license URL points at master.
  • version/version_test.go: TestOpenAPIVersionMatchesTMVersionDefault fails if the two versions differ.
  • .agents/skills/tenderdash-release/SKILL.md: release preparation updates the OpenAPI info.version together with TMVersionDefault.

Remaining v1.8-dev mentions are intentional: scripts/test-local-gates.sh and scripts/release/test_release.py create such refs to check that they are never used. spec/consensus/consensus.md is fixed in #1606.

Testing

  • scripts/release/test_release.py: test_versioned_dev_branches_never_replace_missing_dev failed against the old fallback, passes now; the 12 tests pass.
  • scripts/tests/test_prepare_docs.py: 9 tests pass.
  • go test ./version/: the new test failed against the old v1.8-dev value, passes now. go vet is clean.
  • ruff check / ruff format --check and markdownlint are clean on the changed files (markdownlint still reports pre-existing MD007 warnings in AGENTS.md). golangci-lint is left to CI.

Breaking changes

None for users. plan.py now fails when origin/dev is not fetched instead of planning against v1.8-dev.

Prior work

Attribution

🤖 Generated with Claude Code

🤖 Co-authored by Claudius the Magnificent AI Agent

PR Hygiene · ca4d9d2

  • Bots — thepastaclaw ✓
  • Self-review — not asked of a bot author
  • Build green
  • Approvals
    • files with no dedicated owner (.agents/skills/tenderdash-release/SKILL.md, AGENTS.md, CONTRIBUTING.md and 6 more) — approved by lklimek

When every merge requirement is met, the PR Hygiene check passes. Reviewer limits do not block merging; other required GitHub checks and protections still apply.

lklimek and others added 2 commits November 10, 2026 09:10
AGENTS.md now tells agents to branch from origin/dev and open PRs into
dev (stable hotfixes from master excepted), and states that vX.Y-dev
branches are retired and must not be used even while they still exist
on the remote. CONTRIBUTING.md says the same instead of hinting at
choosing among historical versioned branches.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit f5389e043bddba0a45fa8c6ff3dd37f8dbd0b85e)
- scripts/release/plan.py requires origin/dev and no longer falls back to
  origin/v1.8-dev; the test now asserts that versioned -dev branches never
  stand in for a missing dev.
- scripts/prepare-docs.py links source files to dev by default (the
  Makefile still passes the exact SHA).
- rpc/openapi/openapi.yaml advertises the Tenderdash version instead of a
  branch name, and links the license on master. A test in version/ keeps
  info.version equal to TMVersionDefault, and the release skill updates
  both.

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

coderabbitai Bot commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

Run configuration

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@thepastaclaw

thepastaclaw commented Nov 10, 2026 •

Copy link
Copy Markdown

✅ Final review complete — no blockers (commit ca4d9d2) · triage: low · Phase 2 only (queue backlog)

@lklimek
lklimek marked this pull request as ready for review November 10, 2026 10:18
@lklimek lklimek added this to the v2.0 milestone Nov 10, 2026
@github-actions

Copy link
Copy Markdown

Waiting for bot review — thepastaclaw not yet. Wait for the missing reviews, or a writer can post /skip-bots to proceed without them; blocking findings still need addressing.
Full checklist in the description.

@github-actions github-actions Bot added the waiting-bots Waiting for the review bots to report on this head label Nov 10, 2026

@thepastaclaw thepastaclaw left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Final validation — Phase 2 only (queue backlog)

Verified the changes at ca4d9d2 and the Phase 2 dismissals against the source; no actionable defects were found. The planner requires origin/dev while preserving release-source validation, documentation defaults use dev, and OpenAPI version synchronization has a regression test. Validation was static only: the supplied CI snapshot and current checks show passing code checks, with PR Hygiene and automated review pending; the newer base-policy commit neither supersedes these changes nor introduces reported merge conflicts.

Review provenance

Source: reviewer 1: gpt-6.1-sol (agent: phase2-reviewer, role: general); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)

  • Triage: low by gpt-6.1-sol (effort low) — This is a small, contained documentation and development-tooling change with straightforward behavior updates and focused tests, without affecting consensus, funds, cryptography, networking, or storage.
  • Phase 1 reviewers: not run (skipped for throughput: 13 PRs queued, above the 10 limit)
  • Fresh verifier: gpt-6.1-sol — final-verifier; agent sol-verifier
  • Phase 2 reviewers: gpt-6.1-sol — general (completed, effort medium); agent phase2-reviewer

@github-actions

Copy link
Copy Markdown

Policy satisfied — this can merge.
Full checklist in the description.

@github-actions github-actions Bot removed the waiting-bots Waiting for the review bots to report on this head label Nov 10, 2026
@lklimek
lklimek merged commit 5971e20 into dev Nov 10, 2026
32 checks passed
@lklimek
lklimek deleted the chore/retire-versioned-dev-branches branch November 10, 2026 11:36
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.

3 participants