MokoConsulting/mokocli
Public Access
1
0
Fork 0
Code Issues 3 Pull Requests 1 Releases 8 Wiki Activity

feat: sync feature branch versions with dev after bumps (#250) #285

Merged
jmiller merged 1 commits from feature/250-sync-feature-branch-versions into main 2026-06-21 01:40:00 +00:00
Conversation 0 Commits 1 Files Changed 1
+103
jmiller commented 2026-06-21 01:38:41 +00:00
Owner
Copy Link
Copy Source

Summary

Adds sync-feature-versions.yml workflow that automatically merges dev into all open feature branches when dev gets a version bump (chore(version) commit).

Trigger: push to dev with version bump commit, or manual workflow_dispatch

Branches synced: feature/*, fix/*, patch/*, hotfix/*, bugfix/*, chore/*

Conflict handling: branches with merge conflicts are skipped with a ::warning:: annotation — manual rebase needed.

Test plan

  • Trigger manually via workflow_dispatch
  • Verify it finds and merges dev into feature branches
  • Verify branches already up-to-date are skipped
  • Verify merge conflicts don't fail the workflow

Closes #250

## Summary Adds `sync-feature-versions.yml` workflow that automatically merges `dev` into all open feature branches when dev gets a version bump (`chore(version)` commit). **Trigger**: push to `dev` with version bump commit, or manual `workflow_dispatch` **Branches synced**: `feature/*`, `fix/*`, `patch/*`, `hotfix/*`, `bugfix/*`, `chore/*` **Conflict handling**: branches with merge conflicts are skipped with a `::warning::` annotation — manual rebase needed. ## Test plan - [ ] Trigger manually via workflow_dispatch - [ ] Verify it finds and merges dev into feature branches - [ ] Verify branches already up-to-date are skipped - [ ] Verify merge conflicts don't fail the workflow Closes #250
jmiller added 1 commit 2026-06-21 01:39:49 +00:00
feat: sync feature branch versions with dev after bumps (#250)
Platform: mokoplatform CI / Gate 2: Unit Tests (8.1) (pull_request) Blocked by required conditions
Details
Platform: mokoplatform CI / Gate 2: Unit Tests (8.2) (pull_request) Blocked by required conditions
Details
Platform: mokoplatform CI / Gate 2: Unit Tests (8.3) (pull_request) Blocked by required conditions
Details
Platform: mokoplatform CI / Gate 3: Self-Health Check (pull_request) Blocked by required conditions
Details
Platform: mokoplatform CI / Gate 4: Governance (pull_request) Blocked by required conditions
Details
Platform: mokoplatform CI / Gate 5: Template Integrity (pull_request) Blocked by required conditions
Details
Platform: mokoplatform CI / CI Summary (pull_request) Blocked by required conditions
Details
Universal: PR Check / Build RC Package (pull_request) Blocked by required conditions
Details
Universal: PR Check / Report Issues (pull_request) Blocked by required conditions
Details
Generic: Repo Health / Scripts governance (pull_request) Blocked by required conditions
Details
Generic: Repo Health / Repository health (pull_request) Blocked by required conditions
Details
Generic: Repo Health / Report Issues (pull_request) Blocked by required conditions
Details
Universal: PR Check / Branch Policy (pull_request) Failing after 1s
Details
Generic: Repo Health / Site Health (pull_request) Has been skipped
Details
Generic: Repo Health / Access control (pull_request) Successful in 2s
Details
Universal: PR Check / Validate PR (pull_request) Failing after 6s
Details
Universal: PR Check / Secret Scan (pull_request) Successful in 6s
Details
Universal: Auto Version Bump / Version Bump (push) Successful in 11s
Details
Universal: Build & Release / Promote to RC (pull_request) Has been skipped
Details
Branch Cleanup / Delete merged branch (pull_request) Successful in 2s
Details
RC Revert / Rename rc/ back to dev/ (pull_request) Has been skipped
Details
Universal: Build & Release / Build & Release Pipeline (pull_request) Successful in 18s
Details
Platform: mokoplatform CI / Gate 1: Code Quality (pull_request) Failing after 1m20s
Details
Universal: Workflow Sync Trigger / Sync workflows to live repos (pull_request) Failing after 2m10s
Details
c461cc5520 
Add workflow that merges dev into all open feature/fix/patch/hotfix/bugfix/chore
branches when dev gets a version bump commit. Branches with merge conflicts are
skipped with a warning. Can also be triggered manually via workflow_dispatch.
jmiller force-pushed feature/250-sync-feature-branch-versions from a6dfc15076 to c461cc5520 2026-06-21 01:39:49 +00:00 Compare
jmiller merged commit bd97b6f79c into main 2026-06-21 01:40:00 +00:00
jmiller deleted branch feature/250-sync-feature-branch-versions 2026-06-21 01:40:00 +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
 mokostandards
MokoStandards compliance
 needs-review
Awaiting code review
 php
PHP code changes
 push-failure
File push failure requiring attention
 python
Python code changes
 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
No labels
Priority -
Type -
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/mokocli#285
Delete Branch "feature/250-sync-feature-branch-versions"

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?