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 approves #38

Open
wants to merge 2 commits into
base: history
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Assembly/ArgumentParser/Clockwork.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ArgumentParser
struct Clockwork: ParsableCommand {
static var version: String { "0.5.7" }
static var version: String { "0.5.9" }
static let configuration = CommandConfiguration(
abstract: "Distributed scalable monorepo management tool",
version: Clockwork.version,
Expand Down
4 changes: 2 additions & 2 deletions Sources/Facility/Pure/Report.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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?
}
Expand Down Expand Up @@ -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
),
Expand Down
2 changes: 1 addition & 1 deletion Sources/Facility/Pure/Review/ReviewState.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down