Commit Graph
4 Commits
Author SHA1 Message Date
M57andM57 7bfb6d5c16 ci: support dev staging branch and pre-release tags in release workflow (#999)
Co-authored-by: M57 <hy4ri@users.noreply.github.com>
2026-08-28 14:14:47 +03:00
M57andM57 ebba7ff654 fix(ci): poll mergeable until resolved in conflict detector (#814)
* fix(ci): poll mergeable until resolved in conflict detector

GitHub computes pr.mergeable asynchronously and returns null ('still
computing') for minutes after a push. The detector treated null as
'leave as-is' and never re-checked, so conflicting PRs were never
labeled has-conflicts.

Add a retry loop (getMergeable) that polls until GitHub resolves the
merge state (or times out), so conflicts are reliably labeled.

* fix(ci): poll mergeable, dedupe concurrency, drop checkout, batch PRs

Refine merge-conflict-detector after review:
- concurrency group uses github.ref (stable for both PR + push
  triggers) so cancel-in-progress actually fires on the bulk path.
- drop actions/checkout + contents:read (pure API, no FS needed).
- getMergeable returns the full PR object (no re-fetch in
  checkAndLabel).
- swallow 422 on createLabel and 404 on removeLabel (race-safe).
- batch open PRs in chunks of 5 via Promise.all to bound wall-clock.

---------

Co-authored-by: M57 <hy4ri@users.noreply.github.com>
2026-08-04 19:35:06 +03:00
dependabot[bot] fc3e36ed0f chore: bump actions/github-script from 7 to 9
Bumps [actions/github-script](https://github.com/actions/github-script) from 7 to 9.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v9)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: '9'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-06-25 19:48:58 +00:00
M57andM57 cc40658661 feat: add merge conflict detector workflow (#352)
Co-authored-by: M57 <hy4ri@users.noreply.github.com>
2026-06-24 18:52:22 +03:00