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

fix: cannot disable automerge and while keeping mergify enabled #1783

Merged
merged 7 commits into from
Apr 21, 2022

Conversation

Chriscbr
Copy link
Contributor

Supersedes #1766
Fixes #1765


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@Chriscbr Chriscbr requested a review from a team April 19, 2022 22:15
@mergify mergify bot added the contribution/core ⚙️ used by automation label Apr 19, 2022
Signed-off-by: github-actions <github-actions@github.com>
@codecov-commenter
Copy link

codecov-commenter commented Apr 19, 2022

Codecov Report

Merging #1783 (5e7df09) into main (d90284c) will increase coverage by 1.90%.
The diff coverage is 91.54%.

@@            Coverage Diff             @@
##             main    #1783      +/-   ##
==========================================
+ Coverage   88.06%   89.96%   +1.90%     
==========================================
  Files         132      153      +21     
  Lines        5109     6236    +1127     
  Branches     1207     1598     +391     
==========================================
+ Hits         4499     5610    +1111     
- Misses        610      621      +11     
- Partials        0        5       +5     
Impacted Files Coverage Δ
src/cdk/consts.ts 100.00% <ø> (+36.36%) ⬆️
src/dev-env.ts 83.33% <0.00%> (ø)
src/java/index.ts 100.00% <ø> (ø)
src/python/index.ts 100.00% <ø> (ø)
src/release/bump-version.ts 98.68% <ø> (+0.05%) ⬆️
src/release/index.ts 100.00% <ø> (ø)
src/release/publisher.ts 98.85% <ø> (-0.38%) ⬇️
src/release/release-trigger.ts 100.00% <ø> (ø)
src/release/release.ts 95.79% <ø> (-2.06%) ⬇️
src/release/tag-version.ts 86.66% <ø> (ø)
... and 185 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d11fb80...5e7df09. Read the comment docs.

Copy link
Contributor

@kaizencc kaizencc left a comment

Choose a reason for hiding this comment

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

Some minor nits

test/github/mergify.test.ts Outdated Show resolved Hide resolved
src/javascript/node-project.ts Outdated Show resolved Hide resolved
src/javascript/node-project.ts Outdated Show resolved Hide resolved
src/github/github-project.ts Show resolved Hide resolved
Chriscbr and others added 4 commits April 20, 2022 15:52
Signed-off-by: github-actions <github-actions@github.com>
Signed-off-by: github-actions <github-actions@github.com>
@Chriscbr Chriscbr requested a review from kaizencc April 20, 2022 23:06
Copy link
Contributor

@kaizencc kaizencc left a comment

Choose a reason for hiding this comment

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

Yay!

@mergify mergify bot merged commit a64180a into main Apr 21, 2022
@mergify mergify bot deleted the rybickic/disable-automerge branch April 21, 2022 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core ⚙️ used by automation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No way to disable auto-merge
3 participants