merge: dev into main — CI workflow triggers + version bump #640

Merged
jmiller merged 5 commits from dev into main 2026-06-18 15:32:08 +00:00

5 Commits

Author SHA1 Message Date
Jonathan Miller d877bbbe0c merge: resolve auto-bump version conflicts
Generic: Project CI / Tests (pull_request) Blocked by required conditions
Universal: PR Check / Build RC Package (pull_request) Blocked by required conditions
Universal: PR Check / Report Issues (pull_request) Blocked by required conditions
Generic: Repo Health / Scripts governance (pull_request) Blocked by required conditions
Generic: Repo Health / Repository health (pull_request) Blocked by required conditions
Generic: Repo Health / Report Issues (pull_request) Blocked by required conditions
Branch Policy Check / Verify merge target (pull_request) Successful in 1s
Universal: PR Check / Branch Policy (pull_request) Successful in 1s
Generic: Repo Health / Site Health (pull_request) Has been skipped
Generic: Repo Health / Access control (pull_request) Successful in 2s
Universal: PR Check / Validate PR (pull_request) Failing after 11s
Branch Cleanup / Delete merged branch (pull_request) Has been skipped
RC Revert / Rename rc/ back to dev/ (pull_request) Has been skipped
Generic: Project CI / Lint & Validate (pull_request) Successful in 35s
Universal: Auto Version Bump / Version Bump (push) Successful in 7s
Universal: Secret Scanning / Gitleaks Secret Scan (pull_request) Successful in 1m2s
PR RC Release / Build RC Release (pull_request) Failing after 1m30s
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 2m50s
Universal: Build & Release / Promote to RC (pull_request) Has been skipped
Universal: Build & Release / Build & Release Pipeline (pull_request) Successful in 2m36s
2026-06-18 10:31:45 -05:00
Jonathan Miller 5e401c659b merge: resolve version conflicts, keep main release version 2026-06-18 10:30:44 -05:00
gitea-actions[bot] 7d0b3f042c chore(version): pre-release bump to 06.14.02-dev [skip ci] 2026-06-18 15:28:34 +00:00
Jonathan Miller e0c492c7df fix(ci): run CI and repo-health on PR to main, not on push
Universal: Auto Version Bump / Version Bump (push) Successful in 6s
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 2m19s
CI and repo-health were triggering on push to main, running alongside
(or after) the deploy workflow instead of gating the merge. Move both
to pull_request triggers so they run as PR checks before merge.

- ci-generic: remove push trigger, keep pull_request to main/dev/rc
- repo-health: remove bare push trigger, scope pull_request to main
- deploy-mokogitea stays on push:main (fires only after merge)
2026-06-18 10:27:50 -05:00
gitea-actions[bot] 7f09fa0b98 chore(version): pre-release bump to 06.14.01-dev [skip ci] 2026-06-18 15:21:24 +00:00