Skip to content

Commit 7c65c6d

Browse files
committed
Fix CI failures for Compute and compatibility test workflows
- Remove unnecessary OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH and COMPATIBILITY_TEST env vars from CI workflows - Fix Compute binary iOS build scheme name to match simplified package - Guard compatibilityTestCondition on buildForDarwinPlatform - Fix OAG binary URL env var key name
1 parent 3786bac commit 7c65c6d

4 files changed

Lines changed: 5 additions & 9 deletions

File tree

.github/workflows/compatibility_tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ 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
25-
DARWINPRIVATEFRAMEWORKS_TARGET_RELEASE: 2024
24+
DARWINPRIVATEFRAMEWORKS_TARGET_RELEASE: 202
2625
GH_TOKEN: ${{ github.token }}
2726
steps:
2827
- uses: actions/checkout@v4

.github/workflows/compute.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
2222
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 0
2323
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
24-
OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST: 0
2524
container: swift:${{ matrix.swift_version }}-jammy
2625
steps:
2726
- uses: actions/checkout@v4
@@ -45,7 +44,6 @@ jobs:
4544
OPENATTRIBUTEGRAPH_WERROR: 1
4645
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
4746
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 1
48-
OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST: 0
4947
steps:
5048
- uses: actions/checkout@v4
5149
- name: Setup Xcode
@@ -73,7 +71,6 @@ jobs:
7371
OPENATTRIBUTEGRAPH_WERROR: 1
7472
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
7573
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 1
76-
OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST: 0
7774
steps:
7875
- uses: actions/checkout@v4
7976
- name: Setup Xcode
@@ -86,7 +83,7 @@ jobs:
8683
run: |
8784
xcodebuild build \
8885
-workspace .swiftpm/xcode/package.xcworkspace \
89-
-scheme OpenAttributeGraph-Package \
86+
-scheme OpenAttributeGraph \
9087
-configuration Debug \
9188
-destination "platform=iOS Simulator,OS=${{ matrix.ios-version }},name=${{ matrix.ios-simulator-name }}" \
9289
-derivedDataPath .build-debug \

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: 2 additions & 2 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)
145+
let compatibilityTestCondition = envBoolValue("COMPATIBILITY_TEST", default: false) && buildForDarwinPlatform
146146

147147
let useLocalDeps = envBoolValue("USE_LOCAL_DEPS")
148148
let computeCondition = envBoolValue("OPENATTRIBUTESHIMS_COMPUTE", default: false)
@@ -437,7 +437,7 @@ if computeCondition {
437437
let oagBinary = envBoolValue("OPENATTRIBUTESHIMS_OAG_USE_BINARY", default: false)
438438
if oagBinary {
439439
let version = envStringValue("OPENATTRIBUTESHIMS_OAG_BINARY_VERSION", default: "0.4.0")
440-
let url = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY_URL", default: "https://github.com/OpenSwiftUIProject/OpenAttributeGraph/releases/download/\(version)/OpenAttributeGraph.xcframework.zip")
440+
let url = envStringValue("OPENATTRIBUTESHIMS_OAG_BINARY_URL", default: "https://github.com/OpenSwiftUIProject/OpenAttributeGraph/releases/download/\(version)/OpenAttributeGraph.xcframework.zip")
441441
let checksum = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY_CHECKSUM", default: "a539f876625288d4af7c7d1dccc80fd8e936058791b8071e0d534f5ec1a8a068")
442442
let target = Target.binaryTarget(
443443
name: openAttributeGraphTarget.name,

0 commit comments

Comments
 (0)