Skip to content

Commit 76e602f

Browse files
committed
Fix compatibility_tests
1 parent 04e9984 commit 76e602f

3 files changed

Lines changed: 8 additions & 10 deletions

File tree

.github/workflows/compatibility_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
env:
2020
OPENATTRIBUTEGRAPH_WERROR: 1
21-
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH: 1
2221
OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST: 1
2322
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
2423
OPENATTRIBUTEGRAPH_TARGET_RELEASE: 2024

Package.resolved

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ let swiftCorelibsPath = envStringValue("LIB_SWIFT_PATH") ?? "\(Context.packageDi
142142
let releaseVersion = envIntValue("TARGET_RELEASE", default: 2024)
143143

144144
let libraryEvolutionCondition = envBoolValue("LIBRARY_EVOLUTION", default: buildForDarwinPlatform)
145-
let compatibilityTestCondition = envBoolValue("COMPATIBILITY_TEST", default: false) && buildForDarwinPlatform
145+
let compatibilityTestCondition = envBoolValue("COMPATIBILITY_TEST", default: false)
146146

147147
let useLocalDeps = envBoolValue("USE_LOCAL_DEPS")
148148
let computeCondition = envBoolValue("OPENATTRIBUTESHIMS_COMPUTE", default: false)
@@ -430,7 +430,7 @@ if computeCondition {
430430
}
431431
openAttributeGraphShimsTarget.addComputeSettings()
432432
package.platforms = [.iOS(.v18), .macOS(.v15), .macCatalyst(.v18), .tvOS(.v18), .watchOS(.v10), .visionOS(.v2)]
433-
} else if attributeGraphCondition {
433+
} else if attributeGraphCondition, buildForDarwinPlatform {
434434
setupDPFDependency()
435435
openAttributeGraphShimsTarget.addAGSettings()
436436
} else {
@@ -463,7 +463,10 @@ if computeCondition {
463463
)
464464
}
465465

466-
if compatibilityTestCondition {
466+
package.products.append(
467+
.library(name: "OpenAttributeGraph", type: .dynamic, targets: [openAttributeGraphTarget.name, openAttributeGraphCxxTarget.name])
468+
)
469+
if compatibilityTestCondition, buildForDarwinPlatform {
467470
setupDPFDependency()
468471
openAttributeGraphCompatibilityTestsTarget.addAGSettings()
469472
} else {
@@ -472,10 +475,6 @@ if computeCondition {
472475
openAttributeGraphCxxTestsTarget,
473476
openAttributeGraphShimsTestsTarget,
474477
]
478+
package.platforms = [.iOS(.v13), .macOS(.v10_15), .macCatalyst(.v13), .tvOS(.v13), .watchOS(.v5)]
475479
}
476-
477-
package.products.append(
478-
.library(name: "OpenAttributeGraph", type: .dynamic, targets: [openAttributeGraphTarget.name, openAttributeGraphCxxTarget.name])
479-
)
480-
package.platforms = [.iOS(.v13), .macOS(.v10_15), .macCatalyst(.v13), .tvOS(.v13), .watchOS(.v5)]
481480
}

0 commit comments

Comments
 (0)