You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
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_dispatch trigger that lets us rebuild a PR with conflicts via workflow_dispatch.
The reason will be displayed to describe this comment to others. Learn more.
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.
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-output command is deprecated and will be removed. Use echo "changes=true" >> $GITHUB_OUTPUT instead.
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"
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_dispatch
trigger that lets us rebuild a PR with conflicts viaworkflow_dispatch
.Example run: https://github.com/github/codeql-action/actions/runs/16809277853
Merge / deployment checklist