From 69bc54baa5d5e0fa1afcdd0d0183dd818b2e5c93 Mon Sep 17 00:00:00 2001 From: "George.Cao" Date: Tue, 3 Aug 2021 09:10:32 +0000 Subject: [PATCH 1/3] update OWNERS. --- OWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/OWNERS b/OWNERS index 81ac0e8..1b56780 100644 --- a/OWNERS +++ b/OWNERS @@ -3,4 +3,3 @@ maintainers: - freesky-edward - TommyLike - xiangxinyong - - zerodefect -- Gitee From 7b9ecfdbfd04016851f12b7c2a700b89bca011c8 Mon Sep 17 00:00:00 2001 From: "George.Cao" Date: Tue, 3 Aug 2021 09:56:27 +0000 Subject: [PATCH 2/3] update OWNERS. --- OWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/OWNERS b/OWNERS index 1b56780..4c09d60 100644 --- a/OWNERS +++ b/OWNERS @@ -1,5 +1,4 @@ maintainers: - - edisontest - freesky-edward - TommyLike - xiangxinyong -- Gitee From 65555873d92c50ffb4f4d245e17c470d01da156f Mon Sep 17 00:00:00 2001 From: georgecao Date: Wed, 4 Aug 2021 09:45:16 +0800 Subject: [PATCH 3/3] resolve the frozen problem for openeuler org temporary. --- pkg/cibot/pullrequest.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/cibot/pullrequest.go b/pkg/cibot/pullrequest.go index 35d3a4c..4f75991 100644 --- a/pkg/cibot/pullrequest.go +++ b/pkg/cibot/pullrequest.go @@ -488,7 +488,7 @@ func (s *Server) MergePullRequest(event *gitee.NoteEvent) error { nonRequiringLabels, nonMissingLabels := s.legalLabelsForMerge(listofPrLabels) if len(nonRequiringLabels) == 0 && len(nonMissingLabels) == 0 { // current pr can be merged - if c, b := checkFrozenCanMerge(event.Author.Login, pr.Base.Ref); !b { + if c, b := checkFrozenCanMerge(event.Author.Login, pr.Base.Ref, owner); !b { //send comment to pr comment := "" if len(c) > 0 { @@ -625,7 +625,10 @@ func getSignersAndReviewers(user string, comments []gitee.PullRequestComments) ( return signers, reviewers, nil } -func checkFrozenCanMerge(commenter, branch string) ([]string, bool) { +func checkFrozenCanMerge(commenter, branch string, community string) ([]string, bool) { + if community == "openeuler" { + return nil, true + } frozen, isFrozen := IsBranchFrozen(branch) if isFrozen { canMerge := false -- Gitee