Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use github actions to auto-update dependabot branches #846

Closed
lizthegrey opened this issue Jun 22, 2020 · 4 comments
Closed

use github actions to auto-update dependabot branches #846

lizthegrey opened this issue Jun 22, 2020 · 4 comments
Labels
help wanted Extra attention is needed pkg:tooling Related to the tooling package
Milestone

Comments

@lizthegrey
Copy link
Member

we have (for good reason) "must be in sync with base" to merge, but this results in manual work when trying to merge dependabot updates.

@evantorrie
Copy link
Contributor

As I understand it, dependabot will try to rebase its own PRs so long as commits from "others" have not been made to the PR.

The mod-tidier github workflow is currently configured to run only when a PR branch is labelled with "dependencies". My understanding (yet to be thoroughly vetted) is that

  1. dependabot creates the PR and then labels it with "dependencies".
  2. The mod-tidier github workflow will run and, if it finds any other go.sum files that need to be updated, then will perform its "auto-commit" under the auspices of the most recent committer (in this case, it would be dependabot).

Whether this counts as a commit by "other users" is something I'm yet to ascertain.

If I'm understanding the issue correctly, it may be best to wait until the next "auto-PR open" by dependabot happens, and then see what mod-tidier does with it - whether dependabot will still continue to rebase after mod-tidier runs.

@lizthegrey
Copy link
Member Author

The problem is even if there isn't a conflict, it's necessary to merge. Dependabot knows how to rebase on conflict, but not if there are no conflicts.

@MrAlias MrAlias added help wanted Extra attention is needed pkg:tooling Related to the tooling package and removed release:after-1.0 labels May 3, 2022
@dmathieu
Copy link
Member

It seems like this issue is resolved with #2997, since we now have a single PR for all dependabot upgrades.

@MrAlias
Copy link
Contributor

MrAlias commented Aug 29, 2022

Closed with #2997

@MrAlias MrAlias closed this as completed Aug 29, 2022
@pellared pellared added this to the untracked milestone Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
help wanted Extra attention is needed pkg:tooling Related to the tooling package
Projects
None yet
Development

No branches or pull requests

5 participants