tools: skip dependency update if PR has non-bot commits - #66503
Open
marco-ippolito wants to merge 1 commit into
Open
marco-ippolito wants to merge 1 commit into
marco-ippolito wants to merge 1 commit into
Conversation
When the tools-deps-update workflow finds a new version of a dependency, peter-evans/create-pull-request force-pushes the Action's branch, discarding any commits a collaborator pushed to the existing PR to fix the update. Before running the updater, check whether the open PR for the Action's branch contains commits not authored by the bot, and if so skip the update for that dependency instead of overwriting them. Signed-off-by: Marco Ippolito <marcoippolito54@gmail.com> Assisted-by: claude:opus-5.5
Collaborator
|
Review requested:
|
nodejs-github-bot
added
the
meta
jasnell
approved these changes
Oct 4, 2026
panva
approved these changes
Oct 4, 2026
aduh95
reviewed
Oct 5, 2026
| # Updating the Action's PR force-pushes its branch, so skip the update | ||
| # if someone pushed their own commits to it to avoid discarding them. | ||
| env: | ||
| GH_TOKEN: ${{ secrets.GH_USER_TOKEN }} |
Contributor
There was a problem hiding this comment.
You'd need to add pull-requests permission
Suggested change
| GH_TOKEN: ${{ secrets.GH_USER_TOKEN }} | |
| GH_TOKEN: ${{ github.token }} |
aduh95
reviewed
Oct 5, 2026
Comment on lines
+337
to
+342
| echo "update=false" >> "$GITHUB_OUTPUT" | ||
| else | ||
| echo "update=true" >> "$GITHUB_OUTPUT" | ||
| fi | ||
| - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | ||
| if: steps.check-pr.outputs.update == 'true' |
Contributor
There was a problem hiding this comment.
Suggested change
| echo "update=false" >> "$GITHUB_OUTPUT" | |
| else | |
| echo "update=true" >> "$GITHUB_OUTPUT" | |
| fi | |
| - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | |
| if: steps.check-pr.outputs.update == 'true' | |
| echo "hasNonBotCommits=true" >> "$GITHUB_OUTPUT" | |
| fi | |
| - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | |
| if: steps.check-pr.outputs.hasNonBotCommits != 'true' |
aduh95
reviewed
Oct 5, 2026
| - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 | ||
| - name: Check for non-bot commits on the existing pull request | ||
| id: check-pr | ||
| if: github.event_name == 'schedule' || inputs.id == 'all' || inputs.id == matrix.id |
Contributor
There was a problem hiding this comment.
IMO it would make sense to only run that check on schedule, if someone ran a manual update, they likely meant to override the existing PR
Suggested change
| if: github.event_name == 'schedule' || inputs.id == 'all' || inputs.id == matrix.id | |
| # When 'inputs.id == matrix.id', non-bot commits are being overwritten | |
| if: github.event_name == 'schedule' || inputs.id == 'all' |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
When a new version of a dependency comes out, it runs
create pull requeston the existingactions/tools-update-<id>branch. That force-pushes the branch and throws away any commits a collaborator pushed to fix the update, as happened in #66397 and #66146.This adds a first step that checks the open PR for that branch. If any commit isn't authored by
github-bot@iojs.org, the rest of the job is skipped for that dependency and a notice links to the PR. If there's no open PR, or it only has bot commits, the update runs as before.