Skip to content

Commit f20328e

Browse files
authored
Update Compute backend configuration (#228)
1 parent 2f3beaf commit f20328e

4 files changed

Lines changed: 24 additions & 10 deletions

File tree

‎.github/workflows/compute.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
env:
2020
OPENATTRIBUTEGRAPH_WERROR: 1
2121
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
22-
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 0
22+
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_BINARY: 0
2323
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
2424
container: swift:${{ matrix.swift_version }}-jammy
2525
steps:
@@ -43,7 +43,7 @@ jobs:
4343
env:
4444
OPENATTRIBUTEGRAPH_WERROR: 1
4545
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
46-
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 1
46+
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_BINARY: 1
4747
steps:
4848
- uses: actions/checkout@v4
4949
with:
@@ -70,7 +70,7 @@ jobs:
7070
env:
7171
OPENATTRIBUTEGRAPH_WERROR: 1
7272
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
73-
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 1
73+
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_BINARY: 1
7474
steps:
7575
- uses: actions/checkout@v4
7676
with:

‎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: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -428,11 +428,13 @@ func setupDPFDependency() {
428428
}
429429

430430
if computeCondition {
431-
let computeBinary = envBoolValue("OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY", default: false)
432-
if computeBinary {
431+
let binary = envBoolValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY", default: false)
432+
if binary {
433+
// FIXME: This version is broken and will have runtime crash
433434
let version = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_VERSION", default: "0.2.1")
434-
let url = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_URL", default: "https://github.com/jcmosc/Compute/releases/download/\(version)/Compute.xcframework.zip")
435-
let checksum = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY_CHECKSUM", default: "44eb3f08b9da4e7e308bfb2654b36e6752547e8ba5ec33e19e0648c686990153")
435+
let repo = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_REPO", default: "jcmosc/Compute")
436+
let url = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_URL", default: "https://github.com/\(repo)/releases/download/\(version)/Compute.xcframework.zip")
437+
let checksum = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_CHECKSUM", default: "44eb3f08b9da4e7e308bfb2654b36e6752547e8ba5ec33e19e0648c686990153")
436438
package.targets.append(
437439
.binaryTarget(
438440
name: "Compute",
@@ -441,11 +443,16 @@ if computeCondition {
441443
)
442444
)
443445
} else {
446+
let repo = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_SOURCE_REPO", default: "OpenSwiftUIProject/Compute")
447+
let version = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION")
448+
let branch = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_SOURCE_BRANCH", default: "main")
444449
let computeRepo: Package.Dependency
445450
if useLocalDeps {
446451
computeRepo = Package.Dependency.package(path: "../Compute")
452+
} else if let version {
453+
computeRepo = Package.Dependency.package(url: "https://github.com/\(repo)", exact: .init(stringLiteral: version))
447454
} else {
448-
computeRepo = Package.Dependency.package(url: "https://github.com/jcmosc/Compute", exact: "0.2.1")
455+
computeRepo = Package.Dependency.package(url: "https://github.com/\(repo)", branch: branch)
449456
}
450457
package.dependencies.append(computeRepo)
451458
}

‎Tuist.swift‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
import ProjectDescription
22

33
let tuist = Tuist(
4-
project: .tuist()
4+
project: .tuist(
5+
generationOptions: .options(
6+
manifestEnvironment: [
7+
"OPENSWIFTUI_*",
8+
"OPENATTRIBUTEGRAPH_*",
9+
]
10+
)
11+
)
512
)

0 commit comments

Comments
 (0)