MokoConsulting/Template-Joomla
Template
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix(ci): add conflict-marker guard to release and PR workflows #15

Merged
jmiller merged 43 commits from dev into main 2026-06-03 03:50:55 +00:00
Conversation 0 Commits 43 Files Changed 4
+29 -7
jmiller commented 2026-06-02 23:56:29 +00:00
Owner
Copy Link
Copy Source

Adds conflict-marker guard to release and PR workflows.

Also removes RS_FTP_PATH_SUFFIX from required release variables (MokoGitea handles all releases now).

Adds conflict-marker guard to release and PR workflows. Also removes RS_FTP_PATH_SUFFIX from required release variables (MokoGitea handles all releases now).
jmiller added 40 commits 2026-06-02 23:56:30 +00:00
Merge pull request 'chore: cascade main → dev (2e97edc) [skip ci]' (#12) from main into dev b80ee4a1d4 
chore: cascade main → dev [skip ci]
sync: update-server.yml with updates.xml integrity check [skip ci] 42bf60072c
chore(ci): update pre-release.yml from moko-platform [skip ci] 8a22ece4bb
chore(ci): update auto-release.yml from moko-platform [skip ci] 8e91f85c78
Merge pull request 'chore: cascade main → dev (c94a64e) [skip ci]' (#14) from main into dev ee4d7d30e3 
chore: cascade main → dev [skip ci]
chore(ci): update auto-release.yml from moko-platform [skip ci] dca819dfef
chore(ci): update pre-release.yml from moko-platform [skip ci] 1efada2d37
fix(ci): use release_package.php for Joomla package builds [skip ci] cff2ced161
chore(ci): add auto-bump.yml from moko-platform [skip ci] 5d6c1e6c1a
chore(ci): update pre-release.yml from moko-platform [skip ci] 2e6a20fb6a
chore(ci): update auto-release.yml from moko-platform [skip ci] 604ff5d11e
chore(ci): update auto-bump.yml from moko-platform [skip ci] 582ec0a2db
chore(ci): update auto-release.yml from moko-platform [skip ci] e567d151ca
chore(ci): update pre-release.yml from moko-platform [skip ci] 1a8998702f
chore(ci): update auto-release.yml from moko-platform [skip ci] f8617e298c
chore(ci): update auto-bump.yml from moko-platform [skip ci] f5df49833b
chore(ci): update pre-release.yml from moko-platform [skip ci] 878ac0d6a7
chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] ead3765383
chore: sync .mokogitea/workflows/update-server.yml from moko-platform [skip ci] 13327ac707
chore: sync .mokogitea/workflows/pre-release.yml from moko-platform [skip ci] b34b10db54
chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] dd019143fe
chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] cf4259ea58
chore: sync .mokogitea/workflows/update-server.yml from moko-platform [skip ci] 45f5806189
chore: sync .mokogitea/workflows/auto-bump.yml from moko-platform [skip ci] c8898af2f6
chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] 94fc426d19
chore: sync .mokogitea/workflows/auto-bump.yml from moko-platform [skip ci] b9453f9745
chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] 6711f1f0e6
chore: sync .mokogitea/workflows/pr-check.yml from moko-platform [skip ci] 6737569cc3
chore: sync .mokogitea/workflows/cascade-dev.yml from moko-platform [skip ci] 063b6a6dd9
chore(ci): remove auto-release.yml for update server migration [skip ci] 146d386aa3
chore(ci): remove pre-release.yml for update server migration [skip ci] f1468eede7
chore(ci): remove auto-bump.yml for update server migration [skip ci] bbb0038251
chore(ci): remove cascade-dev.yml for update server migration [skip ci] 77de90d94c
chore(ci): remove update-server.yml for update server migration [skip ci] 8280c5a182
chore(ci): add CI issue reporter for auto-filing gate failures
Generic: Repo Health / Site Health (push) Has been skipped
Details
Generic: Repo Health / Access control (push) Successful in 1s
Details
Generic: Repo Health / Release configuration (push) Has been cancelled
Details
Generic: Repo Health / Scripts governance (push) Has been cancelled
Details
Generic: Repo Health / Repository health (push) Has been cancelled
Details
Generic: Repo Health / Report Issues (push) Has been cancelled
Details
caeffcbeaa
chore(ci): add CI issue reporter for auto-filing gate failures
Generic: Repo Health / Site Health (push) Has been skipped
Details
Generic: Repo Health / Access control (push) Successful in 2s
Details
Generic: Repo Health / Release configuration (push) Has been cancelled
Details
Generic: Repo Health / Scripts governance (push) Has been cancelled
Details
Generic: Repo Health / Repository health (push) Has been cancelled
Details
Generic: Repo Health / Report Issues (push) Has been cancelled
Details
ef99d36668
chore(ci): add CI issue reporter for auto-filing gate failures
Generic: Repo Health / Site Health (push) Has been skipped
Details
Generic: Repo Health / Access control (push) Successful in 2s
Details
Generic: Repo Health / Release configuration (push) Has been cancelled
Details
Generic: Repo Health / Scripts governance (push) Has been cancelled
Details
Generic: Repo Health / Repository health (push) Has been cancelled
Details
Generic: Repo Health / Report Issues (push) Has been cancelled
Details
9bc915817a
fix(ci): add conflict-marker guard to PR check workflow
Generic: Repo Health / Site Health (push) Has been skipped
Details
Generic: Repo Health / Access control (push) Successful in 1s
Details
Generic: Repo Health / Release configuration (push) Has been cancelled
Details
Generic: Repo Health / Scripts governance (push) Has been cancelled
Details
Generic: Repo Health / Repository health (push) Has been cancelled
Details
Generic: Repo Health / Report Issues (push) Has been cancelled
Details
ad0175319a 
Prevents PRs with unresolved merge conflict markers from passing
validation. Scans source files and fails with a clear summary.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
chore: sync .mokogitea/workflows/pr-check.yml from moko-platform [skip ci] a701cc3331
chore: add .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] 98e9d7d8c5
jmiller added 1 commit 2026-06-03 03:00:20 +00:00
chore: add CHANGELOG.md [skip ci] 1150f073b5
jmiller added 1 commit 2026-06-03 03:10:47 +00:00
chore: sync .mokogitea/workflows/repo-health.yml from moko-platform [skip ci] c0bb1c8adc
jmiller added 1 commit 2026-06-03 03:47:11 +00:00
chore: merge main into dev, resolve conflicts keeping dev versions [skip bump]
Generic: Repo Health / Site Health (push) Has been skipped
Details
Generic: Repo Health / Access control (push) Successful in 1s
Details
Universal: Auto Version Bump / Version Bump (push) Has been skipped
Details
Generic: Repo Health / Site Health (pull_request) Has been skipped
Details
Universal: PR Check / Branch Policy (pull_request) Successful in 1s
Details
Generic: Repo Health / Access control (pull_request) Successful in 1s
Details
Joomla: Extension CI / Release Readiness Check (pull_request) Failing after 4s
Details
Universal: Secret Scanning / Gitleaks Secret Scan (pull_request) Successful in 4s
Details
Universal: PR Check / Validate PR (pull_request) Successful in 4s
Details
Joomla: Extension CI / Lint & Validate (pull_request) Failing after 6s
Details
Branch Cleanup / Delete merged branch (pull_request) Has been skipped
Details
Universal: Build & Release / Promote to RC (pull_request) Has been skipped
Details
Universal: Build & Release / Build & Release Pipeline (pull_request) Successful in 9s
Details
Generic: Repo Health / Release configuration (push) Has been cancelled
Details
Generic: Repo Health / Scripts governance (push) Has been cancelled
Details
Generic: Repo Health / Repository health (push) Has been cancelled
Details
Generic: Repo Health / Report Issues (push) Has been cancelled
Details
Joomla: Extension CI / Tests (PHP 8.2) (pull_request) Has been cancelled
Details
Joomla: Extension CI / Tests (PHP 8.3) (pull_request) Has been cancelled
Details
Joomla: Extension CI / PHPStan Analysis (pull_request) Has been cancelled
Details
Joomla: Extension CI / Build RC Pre-Release (pull_request) Has been cancelled
Details
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Details
Universal: PR Check / Report Issues (pull_request) Has been cancelled
Details
Generic: Repo Health / Release configuration (pull_request) Has been cancelled
Details
Generic: Repo Health / Scripts governance (pull_request) Has been cancelled
Details
Generic: Repo Health / Repository health (pull_request) Has been cancelled
Details
Generic: Repo Health / Report Issues (pull_request) Has been cancelled
Details
e864284ad0 
Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
jmiller merged commit 4ec865bde7 into main 2026-06-03 03:50:55 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
breaking-change
Breaking API or behavior change
 ci-cd
CI/CD pipeline changes
 config
Configuration changes
 css
CSS/styling changes
 dependencies
Dependency updates
 deploy-failure
Deployment failed
 documentation
Documentation changes
 good first issue
Good for newcomers
 health-check
Repo health check result
 help wanted
Extra attention needed
 html
HTML/template changes
 joomla
Joomla extension
 major-release
Major version release
 minor-release
Minor version release
 mokostandards
Related to MokoStandards framework
 patch-release
Patch version release
 php
PHP code
 push-failure
Git push operation failed
 release-candidate
Release candidate build
 security
Security vulnerability or hardening
 size/l
200-500 lines changed
 size/m
50-200 lines changed
 size/s
10-50 lines changed
 size/xl
500+ lines changed
 size/xs
< 10 lines changed
 standards-drift
Deviates from MokoStandards
 standards-update
MokoStandards compliance update
 sync-failure
Sync or mirror failed
 version-drift
Version mismatch across files
 work-in-progress
Draft or incomplete work
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/Template-Joomla#15
Delete Branch "dev"

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?