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

ci: require 2 approval to auto-merging #367

Merged
merged 10 commits into from
Feb 15, 2023

Conversation

trim21
Copy link
Contributor

@trim21 trim21 commented Feb 14, 2023

GitHub branch protection rule 没有修改,仍然是 1 个approval,只是修改了 bot 的自动合并条件。

避免 #320 (comment)

@trim21 trim21 requested a review from a team February 14, 2023 17:25
@github-actions
Copy link
Contributor

github-actions bot commented Feb 14, 2023

@codecov
Copy link

codecov bot commented Feb 14, 2023

Codecov Report

Base: 88.14% // Head: 88.14% // No change to project coverage 👍

Coverage data is based on head (6e99e81) compared to base (645fc06).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #367   +/-   ##
=======================================
  Coverage   88.14%   88.14%           
=======================================
  Files          88       88           
  Lines        5062     5062           
  Branches      530      530           
=======================================
  Hits         4462     4462           
  Misses        600      600           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@trim21 trim21 changed the title ci: merge bot rule, require 2 approval to auto merging ci: require 2 approval to auto merging Feb 14, 2023
@trim21 trim21 changed the title ci: require 2 approval to auto merging ci: require 2 approval to auto-merging Feb 14, 2023
@mergify
Copy link

mergify bot commented Feb 14, 2023

@trim21 this pull request is now in conflict 😩

@mergify mergify bot added the conflict label Feb 14, 2023
@mergify mergify bot removed the conflict label Feb 14, 2023
@trim21
Copy link
Contributor Author

trim21 commented Feb 15, 2023

有新commit的情况下 approved-reviews-by 居然不会重置 - -

@Ayase-252
Copy link
Contributor

Screenshot 2023-02-15 at 12 20 49
试下这个?

@trim21
Copy link
Contributor Author

trim21 commented Feb 15, 2023

Screenshot 2023-02-15 at 12 20 49 试下这个?

你approve一下我试试(

Ayase-252
Ayase-252 previously approved these changes Feb 15, 2023
@trim21
Copy link
Contributor Author

trim21 commented Feb 15, 2023

看起来OK

@mergify mergify bot added waiting-opened-48h PR will be merged by bot after it's opened 48h and removed waiting-review labels Feb 15, 2023
@trim21 trim21 merged commit 7133dda into bangumi:master Feb 15, 2023
@mergify mergify bot added waiting-approval waiting code reviewers to approval PR and removed waiting-opened-48h PR will be merged by bot after it's opened 48h labels Feb 15, 2023
@trim21 trim21 deleted the 2-apprival-to-merge branch February 19, 2023 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/S waiting-approval waiting code reviewers to approval PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants