MokoConsulting/MokoOnyx
1
0
Fork 0
Code Issues 10 Pull Requests 1 Releases 3 Wiki Activity

fix: cascade workflow — use PR-based merge for Gitea #10

Merged
jmiller merged 1 commits from fix/cascade-dev-gitea-api into main 2026-05-05 20:43:58 +00:00
Conversation 0 Commits 1 Files Changed 1
+80 -48
jmiller commented 2026-05-05 20:43:51 +00:00
Owner
Copy Link
Copy Source

Summary

  • Fixes the cascade workflow that failed because Gitea has no POST /repos/{owner}/{repo}/merges endpoint
  • Rewrites to a 3-step approach: compare → create PR → auto-merge
  • On conflict: PR stays open for manual resolution (same UX as before)

How it works now

Push to main
    ↓
Check if dev branch exists
    ↓
Compare main vs dev (skip if already in sync)
    ↓
Create PR (main → dev) — reuses existing if one is open
    ↓
Auto-merge if mergeable
    ├─ Clean → Merged ✅
    └─ Conflicts → PR left open for manual resolution ⚠️

Test plan

  • Merge this PR → cascade workflow triggers and merges main into dev
  • Verify dev branch updates to include main's commits
  • Verify the cascade PR is auto-closed after merge

🤖 Generated with Claude Code

## Summary - Fixes the cascade workflow that failed because Gitea has no `POST /repos/{owner}/{repo}/merges` endpoint - Rewrites to a 3-step approach: compare → create PR → auto-merge - On conflict: PR stays open for manual resolution (same UX as before) ## How it works now ``` Push to main ↓ Check if dev branch exists ↓ Compare main vs dev (skip if already in sync) ↓ Create PR (main → dev) — reuses existing if one is open ↓ Auto-merge if mergeable ├─ Clean → Merged ✅ └─ Conflicts → PR left open for manual resolution ⚠️ ``` ## Test plan - [ ] Merge this PR → cascade workflow triggers and merges main into dev - [ ] Verify dev branch updates to include main's commits - [ ] Verify the cascade PR is auto-closed after merge 🤖 Generated with [Claude Code](https://claude.com/claude-code)
jmiller added 1 commit 2026-05-05 20:43:51 +00:00
fix: use PR create+merge for cascade (Gitea has no direct merge API)
Repo Health / Access control (push) Successful in 1s
Details
Repo Health / Release configuration (push) Failing after 2s
Details
Repo Health / Scripts governance (push) Successful in 2s
Details
Repo Health / Repository health (push) Failing after 3s
Details
Joomla Extension CI / Release Readiness Check (pull_request) Successful in 3s
Details
Repo Health / Access control (pull_request) Successful in 1s
Details
Repo Health / Release configuration (pull_request) Failing after 3s
Details
Repo Health / Scripts governance (pull_request) Successful in 3s
Details
Repo Health / Repository health (pull_request) Failing after 3s
Details
PR Check / Validate PR (pull_request) Successful in 20s
Details
Joomla Extension CI / Lint & Validate (pull_request) Failing after 44s
Details
Joomla Extension CI / Tests (PHP 8.2) (pull_request) Has been skipped
Details
Joomla Extension CI / Tests (PHP 8.3) (pull_request) Has been skipped
Details
5d0040b886 
Gitea doesn't support POST /repos/{owner}/{repo}/merges. Rewrites the
cascade workflow to: compare branches, create a PR (main → dev), then
auto-merge if clean. On conflict the PR stays open for manual resolution.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
jmiller merged commit 35e13f6258 into main 2026-05-05 20:43:58 +00:00
jmiller deleted branch fix/cascade-dev-gitea-api 2026-05-05 20:43:58 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
automation
Automated processes or scripts
 breaking-change
Breaking API or functionality change
 build
Build system changes
 ci-cd
CI/CD pipeline changes
 config
Configuration file changes
 css
CSS/styling changes
 dependencies
Dependency updates
 deploy-failure
Automated deploy failure tracking
 docker
Docker configuration changes
 documentation
Documentation changes
 dolibarr
Dolibarr module or extension
 generic
Generic project or library
 good first issue
Good for newcomers
 health-check
Repository health check results
 health: excellent
Health score 90-100
 health: fair
Health score 50-69
 health: good
Health score 70-89
 health: poor
Health score below 50
 help wanted
Extra attention needed
 html
HTML template changes
 javascript
JavaScript code changes
 joomla
Joomla extension or component
 major-release
Major version release
 minor-release
Minor version release
 mokostandards
MokoStandards compliance
 needs-review
Awaiting code review
 patch-release
Patch version release
 php
PHP code changes
 push-failure
File push failure requiring attention
 python
Python code changes
 release-candidate
Release candidate build
 security
Security-related changes
 size/l
Large change (101-300 lines)
 size/m
Medium change (31-100 lines)
 size/s
Small change (11-30 lines)
 size/xl
Extra large change (301-1000 lines)
 size/xs
Extra small change (1-10 lines)
 size/xxl
Extremely large change (1000+ lines)
 standards-drift
Repository drifted from MokoStandards
 standards-update
MokoStandards sync update
 sync-failure
Bulk sync failure requiring attention
 sync-report
Bulk sync run report
 template-validation-failure
Template workflow validation failure
 tests
Test suite changes
 type: bug
Something isn't working
 type: chore
Maintenance tasks
 type: enhancement
Enhancement to existing feature
 type: feature
New feature or request
 type: refactor
Code refactoring
 type: version
Version-related change
 typescript
TypeScript code changes
 version
Version bump or release
 version-drift
Version mismatch detected
 work-in-progress
Work in progress, not ready for merge
bug
Something is not working
 chore
Maintenance and housekeeping
 documentation
Documentation improvements
 enhancement
Improvement to existing functionality
 feature
New feature or request
 pending: dependency
Blocked by another issue or external dependency
 pending: deployment
Tested and approved, awaiting deployment to production
 pending: design
Needs UI/UX or architecture design before implementation
 pending: documentation
Feature works, needs documentation/wiki update
 pending: feedback
Awaiting feedback or decision from stakeholder
 pending: review
Implementation complete, awaiting code review
 pending: testing
Feature implemented but not yet tested
 priority: critical
Must fix immediately
 priority: high
Should fix soon
 priority: low
Nice to have
 priority: medium
Fix when convenient
 refactor
Code restructuring without behavior change
 roadmap
Planned feature or enhancement tracked on the roadmap
 scope: client
Client-specific work
 scope: dolibarr
Dolibarr modules and customizations
 scope: infrastructure
Server, CI, backups, monitoring
 scope: joomla
Joomla templates and extensions
 scope: waas
MokoWaaS platform
 security
Security vulnerability or hardening
 status: blocked
Waiting on external dependency
 status: duplicate
Duplicate of another issue
 status: in-progress
Being worked on
 status: needs-review
Ready for review
 status: wontfix
Will not be addressed
No labels
Type —
Status —
Priority —
Milestone
No items
No Milestone
Assignees
Clear assignees
jmiller (Jonathan Miller)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: MokoConsulting/MokoOnyx#10
Delete Branch "fix/cascade-dev-gitea-api"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?