Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/compute.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
env:
OPENATTRIBUTEGRAPH_WERROR: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 0
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_BINARY: 0
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
container: swift:${{ matrix.swift_version }}-jammy
steps:
Expand All @@ -43,7 +43,7 @@ jobs:
env:
OPENATTRIBUTEGRAPH_WERROR: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_BINARY: 1
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -70,7 +70,7 @@ jobs:
env:
OPENATTRIBUTEGRAPH_WERROR: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY: 1
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE_BINARY: 1
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 12 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -428,11 +428,13 @@ func setupDPFDependency() {
}

if computeCondition {
let computeBinary = envBoolValue("OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY", default: false)
if computeBinary {
let binary = envBoolValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY", default: false)
if binary {
// FIXME: This version is broken and will have runtime crash

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @jcmosc

let version = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_VERSION", default: "0.2.1")
let url = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_URL", default: "https://github.com/jcmosc/Compute/releases/download/\(version)/Compute.xcframework.zip")
let checksum = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_USE_BINARY_CHECKSUM", default: "44eb3f08b9da4e7e308bfb2654b36e6752547e8ba5ec33e19e0648c686990153")
let repo = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_REPO", default: "jcmosc/Compute")
let url = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_URL", default: "https://github.com/\(repo)/releases/download/\(version)/Compute.xcframework.zip")
let checksum = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_CHECKSUM", default: "44eb3f08b9da4e7e308bfb2654b36e6752547e8ba5ec33e19e0648c686990153")
package.targets.append(
.binaryTarget(
name: "Compute",
Expand All @@ -441,11 +443,16 @@ if computeCondition {
)
)
} else {
let repo = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_SOURCE_REPO", default: "OpenSwiftUIProject/Compute")
let version = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION")
Comment thread
Kyle-Ye marked this conversation as resolved.
let branch = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_SOURCE_BRANCH", default: "main")
let computeRepo: Package.Dependency
if useLocalDeps {
computeRepo = Package.Dependency.package(path: "../Compute")
} else if let version {
computeRepo = Package.Dependency.package(url: "https://github.com/\(repo)", exact: .init(stringLiteral: version))
} else {
computeRepo = Package.Dependency.package(url: "https://github.com/jcmosc/Compute", exact: "0.2.1")
computeRepo = Package.Dependency.package(url: "https://github.com/\(repo)", branch: branch)
}
package.dependencies.append(computeRepo)
}
Expand Down
9 changes: 8 additions & 1 deletion Tuist.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import ProjectDescription

let tuist = Tuist(
project: .tuist()
project: .tuist(
generationOptions: .options(
manifestEnvironment: [
"OPENSWIFTUI_*",
"OPENATTRIBUTEGRAPH_*",
]
)
)
)
Loading