From 0f8600ec098c7d4a521b9e7f89b70e0830eacac3 Mon Sep 17 00:00:00 2001 From: Durable Workflow Date: Tue, 1 Sep 2026 13:05:45 +0000 Subject: [PATCH] Make main the stable branch authority --- .github/ISSUE_TEMPLATE/cross_repository.yml | 4 ++-- AGENTS.md | 5 ++--- qualification/policy.json | 4 ++-- qualification/schema.json | 5 +---- scripts/qualification_policy.py | 4 ++-- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/cross_repository.yml b/.github/ISSUE_TEMPLATE/cross_repository.yml index 756ee13..6ad9aea 100644 --- a/.github/ISSUE_TEMPLATE/cross_repository.yml +++ b/.github/ISSUE_TEMPLATE/cross_repository.yml @@ -43,8 +43,8 @@ body: options: - durable-workflow/.github@main - durable-workflow/ai@main - - durable-workflow/workflow@v2 - - durable-workflow/waterline@v2 + - durable-workflow/workflow@main + - durable-workflow/waterline@main - durable-workflow/server@main - durable-workflow/cli@main - durable-workflow/sdk-php@main diff --git a/AGENTS.md b/AGENTS.md index b901a67..cb7e9ec 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -155,9 +155,8 @@ not post lease heartbeats, raw local logs, or vague status text. - Never move or reuse a published tag. Release new versions according to semantic versioning. -- Workflow and Waterline develop on `v2`; `master` is only for explicitly - approved 1.x maintenance until their tracked branch migrations make `main` - the stable 2.x branch and `1.x` the maintenance branch. +- Workflow and Waterline develop on `main`; `1.x` is only for explicitly + approved maintenance of the legacy 1.x line. - Server, CLI, AI, PHP SDK, Python SDK, and Rust SDK develop on `main`. - Each package repository owns ordinary semantic-version releases and publication through a small repository-local workflow. Sample App, Cloud, diff --git a/qualification/policy.json b/qualification/policy.json index b32a894..4416442 100644 --- a/qualification/policy.json +++ b/qualification/policy.json @@ -251,7 +251,7 @@ ] }, "waterline": { - "branch": "v2", + "branch": "main", "repository": "waterline", "workflows": [ { @@ -263,7 +263,7 @@ ] }, "workflow": { - "branch": "v2", + "branch": "main", "repository": "workflow", "workflows": [ { diff --git a/qualification/schema.json b/qualification/schema.json index a38072d..4b570ab 100644 --- a/qualification/schema.json +++ b/qualification/schema.json @@ -95,10 +95,7 @@ "additionalProperties": false, "properties": { "branch": { - "enum": [ - "main", - "v2" - ] + "const": "main" }, "repository": { "minLength": 1, diff --git a/scripts/qualification_policy.py b/scripts/qualification_policy.py index a277b7a..91067de 100644 --- a/scripts/qualification_policy.py +++ b/scripts/qualification_policy.py @@ -37,8 +37,8 @@ "sdk-python": ("sdk-python", "main"), "sdk-rust": ("sdk-rust", "main"), "server": ("server", "main"), - "waterline": ("waterline", "v2"), - "workflow": ("workflow", "v2"), + "waterline": ("waterline", "main"), + "workflow": ("workflow", "main"), } EXPECTED_PUBLIC_AUDIT_TARGETS = set(EXPECTED_TARGETS) - {"cloud"} GITHUB_API_MAX_ATTEMPTS = 5