mirror of
https://github.com/opentibiabr/remeres-map-editor
synced 2026-08-15 18:26:04 -04:00
ef12f60bfb
Improve the vcpkg baseline updater so generated dependency PRs stay synchronized with main, receive the expected CI validation, and can use GitHub native auto-merge. Main changes: - Fetch full repository history before updating the baseline branch. - Synchronize the generated baseline branch with the latest origin/main. - Rebase an existing updater branch onto main before applying new baseline changes. - Create the updater branch from origin/main when it does not already exist. - Use force-with-lease when refreshing the bot-managed branch. - Restrict PR lookup to the repository-owned open baseline PR targeting main. - Avoid unnecessary commits when the requested baseline is already present. - Dispatch CI after creating, updating, or confirming the generated baseline PR. - Queue GitHub native squash auto-merge for existing and newly created baseline PRs. - Use an explicit squash commit subject and plain-text body instead of copying PR Markdown into commit history. - Validate PR numbers before attempting to queue auto-merge. - Leave the PR open with a warning when auto-merge cannot be enabled. CI: - Include update_vcpkg_baseline.yml in the compile change-detection scope. - Include update_vcpkg_baseline.yml in the Docker change-detection scope. - Ensure changes to the updater workflow receive the relevant build validation. Cleanup: - Reformat the existing Apple OpenGL CMake workaround without changing its behavior. Validation: - Ran git diff --check. - Ran actionlint against ci.yml and update_vcpkg_baseline.yml. - Ran bash -n against the extracted updater shell block. This keeps automated vcpkg baseline PRs aligned with current main, ensures updater changes receive build coverage, and lets GitHub complete the squash merge once repository protection requirements are satisfied. |
||
|---|---|---|
| .. | ||
| autofix-ci.yml | ||
| ci.yml | ||
| clean-cache.yaml | ||
| reusable-build-docker.yml | ||
| reusable-build-linux.yml | ||
| reusable-build-macos.yml | ||
| reusable-build-windows.yml | ||
| reusable-checks.yml | ||
| update_vcpkg_baseline.yml | ||