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

chore: enable kodiak automerge by dependency type #286

Merged
merged 1 commit into from
Aug 25, 2021

Conversation

erezrokah
Copy link
Contributor

Which problem is this pull request solving?

Better manage CI resources for dependencies PRs using Kodiak

List other issues or pull requests related to this problem

See chdsbd/kodiak#701 (comment)

Describe the solution you've chosen

Implements the flow from chdsbd/kodiak#701 (comment)

  1. Sets Kodiak to auto merge renovate patch and minor updates. Kodiak will sync those with the default branch before merging.
  2. Tells renovate not to auto merge those, so those PRs don't skip the PRs queue.
  3. Tells renovate to rebase PRs only when they are conflicted (instead when the are 1 commit behind the default branch).

Describe alternatives you've considered

Letting renovate rebase+automerge and waste CI resources.

Checklist

Please add a x inside each checkbox:

  • I have read the contribution guidelines.
  • The status checks are successful (continuous integration). Those can be seen below.

If this works well I'll apply it to the default configuration

@erezrokah erezrokah requested a review from ehmicky August 25, 2021 12:32
@github-actions github-actions bot added the type: chore work needed to keep the product and development running smoothly label Aug 25, 2021
Copy link
Contributor

@ehmicky ehmicky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖

@erezrokah erezrokah merged commit 60adb22 into main Aug 25, 2021
@erezrokah erezrokah deleted the chore/kodiak_auto_merge branch August 25, 2021 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: chore work needed to keep the product and development running smoothly
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants