mirror of
https://github.com/mehah/otclient
synced 2026-08-15 16:29:06 -04:00
d2e7b0f049
ci(vcpkg): keep baseline updates synchronized and auto-mergeable Improve the vcpkg baseline updater so automated dependency PRs stay synchronized with main and can be queued for native GitHub auto-merge. Main changes: - Fetch full repository history before updating the baseline branch. - Synchronize the updater branch with the latest origin/main before applying baseline changes. - Rebase existing updater branches onto main. - Create missing updater branches directly from origin/main. - Use force-with-lease when refreshing bot-managed branches. - Restrict existing PR lookup to open baseline PRs targeting main. - Queue both existing and newly created baseline PRs for native GitHub squash auto-merge. - Set a consistent squash commit subject and body for automated baseline merges. - Validate PR numbers before attempting to enable auto-merge. - Warn and leave the PR open when auto-merge cannot be queued. - Continue triggering CI when the requested baseline is already present. - Update CI path filters so changes to update_vcpkg_baseline.yml trigger Windows, macOS, Android, Docker, and browser validation. Safety: - The updater does not approve reviews. - The updater does not bypass branch protection. - Auto-merge remains subject to required reviews and status checks. - Branch rewrites use force-with-lease instead of an unconditional force push. Validation: - actionlint passed. - YAML parsing passed. - Extracted updater shell script passed bash -n. - git diff --check passed. This makes automated vcpkg baseline maintenance more reliable by preventing stale update branches and allowing GitHub to complete the merge once all repository requirements are satisfied. |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| workflows | ||
| FUNDING.yml | ||
| labeler.yml | ||
| PULL_REQUEST_TEMPLATE.md | ||