Skip to content

Commit 8eff121

Browse files
committed
Fix CI failures for deprecated attributeGraphEnabled and duplicate DPF dependency
1 parent ae02199 commit 8eff121

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

Package.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ private var hasSetupDPFDependency = false
386386
@MainActor
387387
func setupDPFDependency() {
388388
guard !hasSetupDPFDependency else { return }
389+
hasSetupDPFDependency = true
389390
let privateFrameworkRepo: Package.Dependency
390391
if useLocalDeps {
391392
privateFrameworkRepo = Package.Dependency.package(path: "../DarwinPrivateFrameworks")

Tests/OpenAttributeGraphShimsTests/Attribute+DebugTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import OpenAttributeGraphShims
88
import Testing
99

1010
@MainActor
11-
@Suite(.disabled(if: !attributeGraphEnabled, "Subgraph is not implemented on OAG"), .graphScope)
11+
@Suite(.disabled(if: attributeGraphVendor == .oag, "Subgraph is not implemented on OAG"), .graphScope)
1212
struct Attribute_DebugTests {
1313
@Test
1414
func directAttribute() {

Tests/OpenAttributeGraphShimsTests/MetadataDebugTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import AppKit
1515
private typealias PlatformView = NSView
1616
#endif
1717

18-
@Suite(.disabled(if: !attributeGraphEnabled, "forEachField is not implemented for OAG"))
18+
@Suite(.disabled(if: attributeGraphVendor == .oag, "forEachField is not implemented for OAG"))
1919
struct MetadataDebugTests {
2020
struct Demo1 {
2121
var a: Int = .zero

0 commit comments

Comments
 (0)