From 87d6f6aae4de51893c6977549bd2bbf942cd1d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=91?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B4=D1=8C=D0=BA=D0=BE?= Date: Wed, 1 Mar 2023 01:23:10 +0300 Subject: [PATCH 1/2] w --- Sources/Assembly/ArgumentParser/Clockwork.swift | 2 +- Sources/Facility/Pure/Report.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/Assembly/ArgumentParser/Clockwork.swift b/Sources/Assembly/ArgumentParser/Clockwork.swift index f5aca26..eaf39bd 100644 --- a/Sources/Assembly/ArgumentParser/Clockwork.swift +++ b/Sources/Assembly/ArgumentParser/Clockwork.swift @@ -1,6 +1,6 @@ import ArgumentParser struct Clockwork: ParsableCommand { - static var version: String { "0.5.7" } + static var version: String { "0.5.8" } static let configuration = CommandConfiguration( abstract: "Distributed scalable monorepo management tool", version: Clockwork.version, diff --git a/Sources/Facility/Pure/Report.swift b/Sources/Facility/Pure/Report.swift index 3926d69..f61725b 100644 --- a/Sources/Facility/Pure/Report.swift +++ b/Sources/Facility/Pure/Report.swift @@ -187,8 +187,8 @@ public struct Report { public var branch: String } public struct Custom: GenerateContext { - public var authors: [String]? public var merge: Json.GitlabMergeState? + public var review: Review.Info? public var product: String? public var version: String? } @@ -463,8 +463,8 @@ public extension Configuration { cfg: self, threads: threads, ctx: Report.Custom( - authors: state?.authors.sortedNonEmpty, merge: merge, + review: state.map(Review.Info.init(state:)), product: product, version: version ), From 14a52ec2aadd78519f631138c9d510ac8f4d91c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=91?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B4=D1=8C=D0=BA=D0=BE?= Date: Thu, 2 Mar 2023 14:59:51 +0300 Subject: [PATCH 2/2] fix fragil --- Sources/Assembly/ArgumentParser/Clockwork.swift | 2 +- Sources/Facility/Pure/Review/ReviewState.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Assembly/ArgumentParser/Clockwork.swift b/Sources/Assembly/ArgumentParser/Clockwork.swift index eaf39bd..ed80e76 100644 --- a/Sources/Assembly/ArgumentParser/Clockwork.swift +++ b/Sources/Assembly/ArgumentParser/Clockwork.swift @@ -1,6 +1,6 @@ import ArgumentParser struct Clockwork: ParsableCommand { - static var version: String { "0.5.8" } + static var version: String { "0.5.9" } static let configuration = CommandConfiguration( abstract: "Distributed scalable monorepo management tool", version: Clockwork.version, diff --git a/Sources/Facility/Pure/Review/ReviewState.swift b/Sources/Facility/Pure/Review/ReviewState.swift index 22d4939..6527b10 100644 --- a/Sources/Facility/Pure/Review/ReviewState.swift +++ b/Sources/Facility/Pure/Review/ReviewState.swift @@ -273,7 +273,7 @@ extension Review { guard let childs = childs[approve.commit] else { continue } guard approve.resolution != .obsolete else { continue } guard childs.contains(where: { changes[$0] != nil }) else { continue } - guard fragilUsers.contains(approve.login) else { + guard fragilUsers.contains(approve.login).not else { approves[approve.login]?.resolution = .obsolete continue }