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.

Sign up for GitHub

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

Jump to bottom

feat(automerge)!: default to platformAutomerge=true #21327

Merged
merged 2 commits into from
Apr 5, 2023
Merged

feat(automerge)!: default to platformAutomerge=true #21327

merged 2 commits into from
Apr 5, 2023

Conversation

rarkins
Copy link
Collaborator

@rarkins rarkins commented Apr 4, 2023

Changes

BREAKING CHANGE: Platform automerge is now used by default when PR automerge is configured

Context

Closes #21319

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@rarkins
feat(automerge)!: default to platformAutomerge=true
3bd509e 
Closes #21319

BREAKING CHANGE: Platform automerge is now used by default when PR automerge is configured
@rarkins rarkins requested review from viceice and HonkingGoose April 4, 2023 11:49
@rarkins rarkins changed the base branch from main to v36 April 4, 2023 11:53
@rarkins rarkins added the breaking Breaking change, requires major version bump label Apr 4, 2023
@rarkins rarkins enabled auto-merge April 5, 2023 04:45
HonkingGoose
HonkingGoose suggested changes Apr 5, 2023
View reviewed changes
docs/usage/configuration-options.md Outdated Show resolved Hide resolved
docs/usage/key-concepts/automerge.md Outdated Show resolved Hide resolved
docs/usage/key-concepts/automerge.md Outdated Show resolved Hide resolved
lib/modules/platform/gitea/index.md Outdated Show resolved Hide resolved
viceice
viceice approved these changes Apr 5, 2023
View reviewed changes
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

ok, will disable it on my bot, as otherwise it will merge too early without required status checks

@rarkins rarkins added this pull request to the merge queue Apr 5, 2023
Merged via the queue into v36 with commit b31a389 Apr 5, 2023
@rarkins rarkins deleted the feat/21319-platform-automerge-default branch April 5, 2023 09:52
rarkins added a commit that referenced this pull request Apr 26, 2023
@rarkins @HonkingGoose
feat(automerge)!: default to platformAutomerge=true (#21327)
0fb0d80 
Co-authored-by: HonkingGoose <[email protected]>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@HonkingGoose HonkingGoose HonkingGoose approved these changes

@viceice viceice viceice approved these changes

Assignees
No one assigned
Labels
breaking Breaking change, requires major version bump
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Default platformAutomerge=true
3 participants
@rarkins @viceice @HonkingGoose