Enable rebuilding PRs with conflicts #3014
Merged
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Since we check in our compiled code, we frequently get merge conflicts in the compiled code. We have a rebuild Action, but label triggers don't run when there are merge conflicts. So this PR adds a
workflow_dispatchtrigger that lets us rebuild a PR with conflicts viaworkflow_dispatch.Example run: https://github.com/github/codeql-action/actions/runs/16809277853
Merge / deployment checklist