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

43 Commits

Author SHA1 Message Date
Jonathan Miller e864284ad0 chore: merge main into dev, resolve conflicts keeping dev versions [skip bump]
Generic: Repo Health / Site Health (push) Has been skipped
Generic: Repo Health / Access control (push) Successful in 1s
Universal: Auto Version Bump / Version Bump (push) Has been skipped
Generic: Repo Health / Site Health (pull_request) Has been skipped
Universal: PR Check / Branch Policy (pull_request) Successful in 1s
Generic: Repo Health / Access control (pull_request) Successful in 1s
Joomla: Extension CI / Release Readiness Check (pull_request) Failing after 4s
Universal: Secret Scanning / Gitleaks Secret Scan (pull_request) Successful in 4s
Universal: PR Check / Validate PR (pull_request) Successful in 4s
Joomla: Extension CI / Lint & Validate (pull_request) Failing after 6s
Branch Cleanup / Delete merged branch (pull_request) Has been skipped
Universal: Build & Release / Promote to RC (pull_request) Has been skipped
Universal: Build & Release / Build & Release Pipeline (pull_request) Successful in 9s
Generic: Repo Health / Release configuration (push) Has been cancelled
Generic: Repo Health / Scripts governance (push) Has been cancelled
Generic: Repo Health / Repository health (push) Has been cancelled
Generic: Repo Health / Report Issues (push) Has been cancelled
Joomla: Extension CI / Tests (PHP 8.2) (pull_request) Has been cancelled
Joomla: Extension CI / Tests (PHP 8.3) (pull_request) Has been cancelled
Joomla: Extension CI / PHPStan Analysis (pull_request) Has been cancelled
Joomla: Extension CI / Build RC Pre-Release (pull_request) Has been cancelled
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Universal: PR Check / Report Issues (pull_request) Has been cancelled
Generic: Repo Health / Release configuration (pull_request) Has been cancelled
Generic: Repo Health / Scripts governance (pull_request) Has been cancelled
Generic: Repo Health / Repository health (pull_request) Has been cancelled
Generic: Repo Health / Report Issues (pull_request) Has been cancelled
Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-06-02 22:47:09 -05:00
jmiller c0bb1c8adc chore: sync .mokogitea/workflows/repo-health.yml from moko-platform [skip ci] 2026-06-03 03:10:46 +00:00
jmiller 1150f073b5 chore: add CHANGELOG.md [skip ci] 2026-06-03 03:00:18 +00:00
jmiller 98e9d7d8c5 chore: add .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] 2026-06-02 23:47:20 +00:00
jmiller a701cc3331 chore: sync .mokogitea/workflows/pr-check.yml from moko-platform [skip ci] 2026-06-02 21:51:38 +00:00
Jonathan Miller ad0175319a fix(ci): add conflict-marker guard to PR check workflow
Generic: Repo Health / Site Health (push) Has been skipped
Generic: Repo Health / Access control (push) Successful in 1s
Generic: Repo Health / Release configuration (push) Has been cancelled
Generic: Repo Health / Scripts governance (push) Has been cancelled
Generic: Repo Health / Repository health (push) Has been cancelled
Generic: Repo Health / Report Issues (push) Has been cancelled
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>
2026-06-02 16:43:36 -05:00
Moko Consulting 9bc915817a chore(ci): add CI issue reporter for auto-filing gate failures
Generic: Repo Health / Site Health (push) Has been skipped
Generic: Repo Health / Access control (push) Successful in 2s
Generic: Repo Health / Release configuration (push) Has been cancelled
Generic: Repo Health / Scripts governance (push) Has been cancelled
Generic: Repo Health / Repository health (push) Has been cancelled
Generic: Repo Health / Report Issues (push) Has been cancelled
2026-06-02 20:37:02 +00:00
Moko Consulting ef99d36668 chore(ci): add CI issue reporter for auto-filing gate failures
Generic: Repo Health / Site Health (push) Has been skipped
Generic: Repo Health / Access control (push) Successful in 2s
Generic: Repo Health / Release configuration (push) Has been cancelled
Generic: Repo Health / Scripts governance (push) Has been cancelled
Generic: Repo Health / Repository health (push) Has been cancelled
Generic: Repo Health / Report Issues (push) Has been cancelled
2026-06-02 20:37:01 +00:00
Moko Consulting caeffcbeaa chore(ci): add CI issue reporter for auto-filing gate failures
Generic: Repo Health / Site Health (push) Has been skipped
Generic: Repo Health / Access control (push) Successful in 1s
Generic: Repo Health / Release configuration (push) Has been cancelled
Generic: Repo Health / Scripts governance (push) Has been cancelled
Generic: Repo Health / Repository health (push) Has been cancelled
Generic: Repo Health / Report Issues (push) Has been cancelled
2026-06-02 20:37:00 +00:00
gitea-actions[bot] 8280c5a182 chore(ci): remove update-server.yml for update server migration [skip ci] 2026-05-31 03:50:51 +00:00
gitea-actions[bot] 77de90d94c chore(ci): remove cascade-dev.yml for update server migration [skip ci] 2026-05-31 03:50:46 +00:00
gitea-actions[bot] bbb0038251 chore(ci): remove auto-bump.yml for update server migration [skip ci] 2026-05-31 03:50:42 +00:00
gitea-actions[bot] f1468eede7 chore(ci): remove pre-release.yml for update server migration [skip ci] 2026-05-31 03:50:39 +00:00
gitea-actions[bot] 146d386aa3 chore(ci): remove auto-release.yml for update server migration [skip ci] 2026-05-31 03:50:37 +00:00
jmiller 063b6a6dd9 chore: sync .mokogitea/workflows/cascade-dev.yml from moko-platform [skip ci] 2026-05-31 01:45:28 +00:00
jmiller 6737569cc3 chore: sync .mokogitea/workflows/pr-check.yml from moko-platform [skip ci] 2026-05-30 16:03:17 +00:00
jmiller 6711f1f0e6 chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] 2026-05-30 15:04:05 +00:00
jmiller b9453f9745 chore: sync .mokogitea/workflows/auto-bump.yml from moko-platform [skip ci] 2026-05-30 15:01:38 +00:00
jmiller 94fc426d19 chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] 2026-05-30 01:16:34 +00:00
jmiller c8898af2f6 chore: sync .mokogitea/workflows/auto-bump.yml from moko-platform [skip ci] 2026-05-29 10:32:02 +00:00
jmiller 45f5806189 chore: sync .mokogitea/workflows/update-server.yml from moko-platform [skip ci] 2026-05-28 20:50:50 +00:00
jmiller cf4259ea58 chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] 2026-05-28 20:46:04 +00:00
jmiller dd019143fe chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] 2026-05-28 20:27:59 +00:00
jmiller b34b10db54 chore: sync .mokogitea/workflows/pre-release.yml from moko-platform [skip ci] 2026-05-28 20:09:01 +00:00
jmiller 13327ac707 chore: sync .mokogitea/workflows/update-server.yml from moko-platform [skip ci] 2026-05-28 20:05:42 +00:00
jmiller ead3765383 chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] 2026-05-28 20:02:22 +00:00
jmiller 878ac0d6a7 chore(ci): update pre-release.yml from moko-platform [skip ci] 2026-05-26 22:50:57 +00:00
jmiller f5df49833b chore(ci): update auto-bump.yml from moko-platform [skip ci] 2026-05-26 22:49:45 +00:00
jmiller f8617e298c chore(ci): update auto-release.yml from moko-platform [skip ci] 2026-05-26 22:48:32 +00:00
jmiller 1a8998702f chore(ci): update pre-release.yml from moko-platform [skip ci] 2026-05-26 22:37:01 +00:00
jmiller e567d151ca chore(ci): update auto-release.yml from moko-platform [skip ci] 2026-05-26 22:35:38 +00:00
jmiller 582ec0a2db chore(ci): update auto-bump.yml from moko-platform [skip ci] 2026-05-26 22:25:15 +00:00
jmiller 604ff5d11e chore(ci): update auto-release.yml from moko-platform [skip ci] 2026-05-26 22:23:59 +00:00
jmiller 2e6a20fb6a chore(ci): update pre-release.yml from moko-platform [skip ci] 2026-05-26 22:13:22 +00:00
jmiller 5d6c1e6c1a chore(ci): add auto-bump.yml from moko-platform [skip ci] 2026-05-26 22:12:10 +00:00
jmiller cff2ced161 fix(ci): use release_package.php for Joomla package builds [skip ci] 2026-05-26 19:54:13 +00:00
jmiller 1efada2d37 chore(ci): update pre-release.yml from moko-platform [skip ci] 2026-05-26 19:36:36 +00:00
jmiller dca819dfef chore(ci): update auto-release.yml from moko-platform [skip ci] 2026-05-26 19:36:35 +00:00
jmiller ee4d7d30e3 Merge pull request 'chore: cascade main → dev (c94a64e) [skip ci]' (#14) from main into dev
chore: cascade main → dev [skip ci]
2026-05-26 18:59:39 +00:00
jmiller 8e91f85c78 chore(ci): update auto-release.yml from moko-platform [skip ci] 2026-05-26 17:36:28 +00:00
jmiller 8a22ece4bb chore(ci): update pre-release.yml from moko-platform [skip ci] 2026-05-26 17:35:20 +00:00
jmiller 42bf60072c sync: update-server.yml with updates.xml integrity check [skip ci] 2026-05-26 04:47:48 +00:00
jmiller b80ee4a1d4 Merge pull request 'chore: cascade main → dev (2e97edc) [skip ci]' (#12) from main into dev
chore: cascade main → dev [skip ci]
2026-05-26 04:31:39 +00:00