Skip to content

Commit ae7f863

Browse files
authored
do not emit "exhausted attempts to resolve the dependencies graph" when previous errors occurred (#6955)
motivation: better error diagnostics changes: * check for previous errors when updating dependencies and terminate early if core update/checkout depedenncies occurred rdar://112134269
1 parent cf5facd commit ae7f863

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Sources/Workspace/Workspace.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1171,6 +1171,9 @@ extension Workspace {
11711171

11721172
// Update the checkouts based on new dependency resolution.
11731173
let packageStateChanges = self.updateDependenciesCheckouts(root: graphRoot, updateResults: updateResults, updateBranches: true, observabilityScope: observabilityScope)
1174+
guard !observabilityScope.errorsReported else {
1175+
return nil
1176+
}
11741177

11751178
// Load the updated manifests.
11761179
let updatedDependencyManifests = try self.loadDependencyManifests(root: graphRoot, observabilityScope: observabilityScope)
@@ -1199,7 +1202,7 @@ extension Workspace {
11991202
observabilityScope: observabilityScope
12001203
)
12011204

1202-
return nil
1205+
return packageStateChanges
12031206
}
12041207

12051208
@discardableResult

0 commit comments

Comments
 (0)