Enable rebuilding PRs with conflicts #3014
Open
+69
−24
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR enables rebuilding PRs with merge conflicts by adding a workflow_dispatch trigger to the rebuild workflow. Since label triggers don't work when PRs have conflicts, this provides an alternative way to rebuild the compiled code through manual workflow dispatch.
- Added
workflow_dispatchtrigger alongside existing label trigger - Updated condition logic to handle both trigger types with fallback values
- Moved PR-specific operations (label removal, commenting) to be conditional on pull request events
Comments suppressed due to low confidence (2)
.github/workflows/rebuild.yml:80
- The
set-outputcommand is deprecated and will be removed. Useecho "changes=true" >> $GITHUB_OUTPUTinstead.
echo "::set-output name=changes::true"
.github/workflows/rebuild.yml:92
- [nitpick] The notification logic has been moved outside the conditional block but still executes the same commands. This creates duplicate logic that was previously inside the 'if' statement. Consider keeping this logic together with the push operation or clearly separating the concerns.
echo "Pushed a commit to rebuild the Action." \
"Please mark the PR as ready for review to trigger PR checks." |
gh pr comment --body-file - --repo github/codeql-action "$PR_NUMBER"
gh pr ready --undo --repo github/codeql-action "$PR_NUMBER"
3 tasks
mbg
previously approved these changes
Aug 7, 2025
mbg
previously approved these changes
Aug 7, 2025
henrymercer
force-pushed
the
henrymercer/rebuild-dispatch
branch
3 times, most recently
from
4175311 to
eaa1870
Compare
henrymercer
force-pushed
the
henrymercer/rebuild-dispatch
branch
from
eaa1870 to
bd62bf4
Compare
mbg
approved these changes
Aug 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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