Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aarch64 windows support #163

Merged
merged 1 commit into from
Dec 19, 2024
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
56 changes: 31 additions & 25 deletions .github/workflows/publish-jvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,35 +29,41 @@ jobs:
job:
# In order to load any added target at runtime, editing the Zenoh class under jvmMain is required.
- {
target: x86_64-unknown-linux-gnu,
arch: amd64,
os: ubuntu-20.04,
build-cmd: "cargo",
}
target: x86_64-unknown-linux-gnu,
arch: amd64,
os: ubuntu-20.04,
build-cmd: "cargo",
}
- {
target: aarch64-unknown-linux-gnu,
arch: arm64,
os: ubuntu-20.04,
build-cmd: "cross",
}
target: aarch64-unknown-linux-gnu,
arch: arm64,
os: ubuntu-20.04,
build-cmd: "cross",
}
- {
target: x86_64-apple-darwin,
arch: darwin,
os: macos-latest,
build-cmd: "cargo",
}
target: x86_64-apple-darwin,
arch: darwin,
os: macos-latest,
build-cmd: "cargo",
}
- {
target: aarch64-apple-darwin,
arch: darwin,
os: macos-latest,
build-cmd: "cargo",
}
target: aarch64-apple-darwin,
arch: darwin,
os: macos-latest,
build-cmd: "cargo",
}
- {
target: x86_64-pc-windows-msvc,
arch: win64,
os: windows-2019,
build-cmd: "cargo",
}
target: x86_64-pc-windows-msvc,
arch: win64,
os: windows-2019,
build-cmd: "cargo",
}
- {
target: aarch64-pc-windows-msvc,
arch: arm64,
os: windows-2019,
build-cmd: "cargo",
}
steps:
- name: Checkout source code
uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions zenoh-java/src/jvmMain/kotlin/io/zenoh/Target.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package io.zenoh

internal enum class Target {
WINDOWS_X86_64_MSVC,
WINDOWS_AARCH64_MSVC,
LINUX_X86_64,
LINUX_AARCH64,
APPLE_AARCH64,
Expand All @@ -24,6 +25,7 @@ internal enum class Target {
override fun toString(): String {
return when (this) {
WINDOWS_X86_64_MSVC -> "x86_64-pc-windows-msvc"
WINDOWS_AARCH64_MSVC -> "aarch64-pc-windows-msvc"
LINUX_X86_64 -> "x86_64-unknown-linux-gnu"
LINUX_AARCH64 -> "aarch64-unknown-linux-gnu"
APPLE_AARCH64 -> "aarch64-apple-darwin"
Expand Down
4 changes: 4 additions & 0 deletions zenoh-java/src/jvmMain/kotlin/io/zenoh/Zenoh.kt
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ internal actual object ZenohLoad {
osName.contains("win") -> when {
osArch.contains("x86_64") || osArch.contains("amd64") || osArch.contains("x64") ->
Target.WINDOWS_X86_64_MSVC

osArch.contains("aarch64") || osArch.contains("arm64") ->
Target.WINDOWS_AARCH64_MSVC

else -> throw UnsupportedOperationException("Unsupported architecture on Windows: $osArch")
}

Expand Down
Loading