oblachno-oss/grm
2
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases 7 Wiki Activity

GRM-57: Fully automate PR merge workflow #83

Merged
emil merged 1 commits from GRM-60-automate-workflow into master 2026-06-22 10:45:27 +00:00
Conversation 1 Commits 1 Files Changed 16
+335 -1541
emil commented 2026-06-22 10:43:12 +00:00
Owner
Copy Link
Copy Source

Summary

Replaces the manual "ready-to-merge" label + APPROVE review workflow with automatic merging when CI passes.

Changes

New .taskid file support

  • auto_merge.py reads task ID from .taskid file
  • Falls back to branch name extraction for backwards compatibility
  • Eliminates regex parsing of branch names as primary source

Auto-merge moved to ci.yml

  • New auto-merge job in ci.yml with needs: [quality, detect-changes, pr-review]
  • Runs after all CI checks pass, squash-merges automatically
  • No manual label or review needed — CI is the quality gate
  • Removed auto-merge.yml workflow (replaced by ci.yml job)

Dead code removal

  • review_pr.py + tests: Manual review posting tool (no longer needed)
  • REVIEW_CHECKLIST.md: Manual review checklist (no longer needed)
  • LABEL_CONFIG + ready-to-merge label: No longer used
  • Label creation removed from configure_repo.py (no more tea dependency)
  • has_ready_to_merge_label(), has_approval_review(), wait_for_ci()** removed from auto_merge.py

Updated pr_review.py

  • Removed manual review instructions (REVIEW_CHECKLIST.md reference)
  • Added auto-merge note: "If all CI checks pass, this PR will be merged automatically."

New Workflow (4 manual steps, down from 7)

  1. Create Vikunja task → GRM-N
  2. Create .taskid file + branch + implement + PR
  3. CI runs (quality, molecule, automated review)
  4. All CI passes → auto-merge happens automatically
  5. Post-merge runs (release, badges, vikunja, etc.)

Removed manual steps:

  • Review PR against checklist
  • Post APPROVE review with --checklist-confirmed
  • Add "ready-to-merge" label

Test Coverage

All 799 tests pass with 100% coverage. Net deletion: 1206 lines removed.

## Summary Replaces the manual "ready-to-merge" label + APPROVE review workflow with automatic merging when CI passes. ## Changes ### New `.taskid` file support - `auto_merge.py` reads task ID from `.taskid` file - Falls back to branch name extraction for backwards compatibility - Eliminates regex parsing of branch names as primary source ### Auto-merge moved to ci.yml - New `auto-merge` job in `ci.yml` with `needs: [quality, detect-changes, pr-review]` - Runs after all CI checks pass, squash-merges automatically - No manual label or review needed — CI is the quality gate - Removed `auto-merge.yml` workflow (replaced by ci.yml job) ### Dead code removal - **`review_pr.py`** + tests: Manual review posting tool (no longer needed) - **`REVIEW_CHECKLIST.md`**: Manual review checklist (no longer needed) - **`LABEL_CONFIG`** + `ready-to-merge` label: No longer used - **Label creation** removed from `configure_repo.py` (no more `tea` dependency) - **`has_ready_to_merge_label()`**, `has_approval_review()`, `wait_for_ci()`** removed from `auto_merge.py` ### Updated `pr_review.py` - Removed manual review instructions (REVIEW_CHECKLIST.md reference) - Added auto-merge note: "If all CI checks pass, this PR will be merged automatically." ## New Workflow (4 manual steps, down from 7) 1. Create Vikunja task → GRM-N 2. Create `.taskid` file + branch + implement + PR 3. CI runs (quality, molecule, automated review) 4. **All CI passes → auto-merge happens automatically** 5. Post-merge runs (release, badges, vikunja, etc.) ### Removed manual steps: - ~~Review PR against checklist~~ - ~~Post APPROVE review with --checklist-confirmed~~ - ~~Add "ready-to-merge" label~~ ## Test Coverage All 799 tests pass with 100% coverage. Net deletion: 1206 lines removed.
emil added 1 commit 2026-06-22 10:43:13 +00:00
refactor: fully automate PR merge — no manual label/review needed
CI / pr-review (pull_request) Successful in 1m8s
Details
CI / detect-changes (pull_request) Successful in 1m17s
Details
CI / discover-runners (pull_request) Has been skipped
Details
CI / quality (pull_request) Successful in 1m58s
Details
CI / molecule-tests (1) (pull_request) Has been skipped
Details
CI / molecule-tests (2) (pull_request) Has been skipped
Details
CI / molecule-tests (3) (pull_request) Has been skipped
Details
CI / auto-merge (pull_request) Successful in 9s
Details
CI / release-dry-run (pull_request) Successful in 56s
Details
ad2f5b43fb 
Replaces the manual "ready-to-merge" label + APPROVE review workflow
with automatic merging when CI passes.

Changes:
- Add .taskid file support: auto_merge.py reads task ID from .taskid
  file, falling back to branch name extraction for backwards compat
- Add auto-merge job to ci.yml: runs after quality + pr-review pass,
  squash-merges automatically (no manual label needed)
- Remove auto-merge.yml workflow (replaced by ci.yml auto-merge job)
- Remove review_pr.py and tests (manual review posting tool — dead code)
- Remove REVIEW_CHECKLIST.md (manual checklist — no longer needed)
- Remove LABEL_CONFIG and ready-to-merge label from config.py
- Remove label creation from configure_repo.py (no more tea dependency)
- Update pr_review.py: remove manual review instructions, add auto-merge note
- Update classify_changes.py: remove REVIEW_CHECKLIST.md from allowlist
- Update all affected tests

New workflow (4 manual steps, down from 7):
1. Create Vikunja task → GRM-N
2. Create .taskid file + branch + implement + PR
3. CI runs (quality, molecule, automated review)
4. All CI passes → auto-merge happens automatically
5. Post-merge runs (release, badges, vikunja, etc.)

Removed manual steps:
- Review PR against checklist
- Post APPROVE review with --checklist-confirmed
- Add "ready-to-merge" label

All 799 tests pass with 100% coverage.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
emil reviewed 2026-06-22 10:44:23 +00:00
emil left a comment
Author
Owner
Copy Link
Copy Source

Automated PR Review

  • Architecture compliance: OK
  • Best practices: OK
  • Security: OK
  • i18n: OK
  • Resource management: OK
  • Documentation: WARNING — source files changed but no docs updated
  • Tests: OK
  • Commit conventions: OK

No issues found by automated checks.

Auto-merge: If all CI checks pass, this PR will be merged automatically.

## Automated PR Review - Architecture compliance: OK - Best practices: OK - Security: OK - i18n: OK - Resource management: OK - Documentation: WARNING — source files changed but no docs updated - Tests: OK - Commit conventions: OK No issues found by automated checks. --- **Auto-merge:** If all CI checks pass, this PR will be merged automatically.
emil merged commit bfa3e99f75 into master 2026-06-22 10:45:27 +00:00
emil deleted branch GRM-60-automate-workflow 2026-06-22 10:45:27 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
emil
Labels
Clear labels
bug
Something is not working
 ci-improvement
CI workflow improvements
 doc-improvement
Documentation improvements
 feedback
Issues from subagent or agent feedback
 ready-to-merge
Auto-merge PR when all CI checks pass
 tooling
Tool-related feedback or improvements
 workflow-improvement
Workflow alignment or pattern improvements
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
emil (emil User) kireto
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: oblachno-oss/grm#83