diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f117061..b2dab8b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -120,8 +120,7 @@ jobs: auto-merge: # Auto-merge runs after all CI checks pass. It reads the task ID - # from the branch name (falling back to .taskid file), validates - # the PR title, and squash-merges. + # from the branch name, validates the PR title, and squash-merges. needs: [quality, detect-changes, pr-review] if: github.event_name == 'pull_request' runs-on: docker diff --git a/docs/tech/architecture.md b/docs/tech/architecture.md index b44e081..719f8c8 100644 --- a/docs/tech/architecture.md +++ b/docs/tech/architecture.md @@ -188,7 +188,7 @@ repos that only need a Gitea release. ### `auto_merge.py` Auto-merges a PR when all CI checks pass. Reads the task ID from the branch -name (falling back to `.taskid` file), validates the PR title format against +name, validates the PR title format against the Vikunja task title, extracts the conventional commit message from PR commits, and squash-merges with title `{PREFIX}-N `. diff --git a/docs/tech/ci-cd-workflow.md b/docs/tech/ci-cd-workflow.md index 085969e..a41cce7 100644 --- a/docs/tech/ci-cd-workflow.md +++ b/docs/tech/ci-cd-workflow.md @@ -93,8 +93,7 @@ Depends on `quality`, `detect-changes`, and `pr-review`. The final job in the CI workflow. Runs `python -m devx.ci.auto_merge` with the branch name, PR title, repository, and PR number: -1. **Read task ID** from branch name (e.g., `DEVX-12-fix-foo` → `DEVX-12`), - falling back to `.taskid` file for branches without a task ID prefix +1. **Read task ID** from branch name (e.g., `DEVX-12-fix-foo` → `DEVX-12`) 2. **Validate PR title format** — must be `{PREFIX}-N: ` 3. **Validate PR title matches Vikunja task** — fetches the Vikunja task and compares the title @@ -330,8 +329,7 @@ On failure, the `notify_failure` step creates a Gitea issue. ### `auto_merge.py` Auto-merge PR when all CI checks pass. Reads task ID from the branch name -(e.g., `DEVX-12-fix-foo` → `DEVX-12`), falling back to `.taskid` file for -branches without a task ID prefix. Validates PR title format, checks the +(e.g., `DEVX-12-fix-foo` → `DEVX-12`). Validates PR title format, checks the Vikunja task exists and the title matches, extracts the conventional commit message from PR commits, and squash-merges with `{PREFIX}-N ` title. diff --git a/docs/user/cli-commands.md b/docs/user/cli-commands.md index 3aaaede..042c4a1 100644 --- a/docs/user/cli-commands.md +++ b/docs/user/cli-commands.md @@ -18,7 +18,7 @@ devx molecule --help # show molecule commands ### `devx ci auto-merge` Auto-merge a PR when all CI checks pass. Reads the task ID from the branch -name (falling back to `.taskid` file), validates the PR title format against +name, validates the PR title format against the Vikunja task title, extracts the conventional commit message from PR commits, and squash-merges with `{PREFIX}-N ` title.