Skip to content

Commit

Permalink
Fix build for Linux for aarch64 (#1891)
Browse files Browse the repository at this point in the history
  • Loading branch information
Quinn-With-Two-Ns authored Oct 10, 2023
1 parent d5d96f8 commit dac53be
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions temporal-serviceclient/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ protobuf {
// protoc and protoc-gen-grpc-java versions are selected to be compatible
// with the oldest supported versions of protoc and grpc artifacts.
protoc {
artifact = 'com.google.protobuf:protoc:3.10.1' + (System.getProperty("os.arch") == 'aarch64' ? ':osx-x86_64' : '')
artifact = 'com.google.protobuf:protoc:3.10.1' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '')
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.34.1' + (System.getProperty("os.arch") == 'aarch64' ? ':osx-x86_64' : '')
artifact = 'io.grpc:protoc-gen-grpc-java:1.34.1' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '')
}
}
generateProtoTasks {
Expand Down
4 changes: 2 additions & 2 deletions temporal-test-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ protobuf {
// protoc and protoc-gen-grpc-java versions are selected to be compatible
// with the oldest supported versions of protoc and grpc artifacts.
protoc {
artifact = 'com.google.protobuf:protoc:3.10.1' + (System.getProperty("os.arch") == 'aarch64' ? ':osx-x86_64' : '')
artifact = 'com.google.protobuf:protoc:3.10.1' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '')
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.34.1' + (System.getProperty("os.arch") == 'aarch64' ? ':osx-x86_64' : '')
artifact = 'io.grpc:protoc-gen-grpc-java:1.34.1' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '')
}
}
generateProtoTasks {
Expand Down

0 comments on commit dac53be

Please sign in to comment.