Fix build for Linux for aarch64 (#1891)

Quinn-With-Two-Ns · web-flow · commit dac53bee09e6 · 2023-10-10T13:54:30.000-07:00
diff --git a/temporal-serviceclient/build.gradle b/temporal-serviceclient/build.gradle
@@ -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 {
diff --git a/temporal-test-server/build.gradle b/temporal-test-server/build.gradle
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ protobuf {`
`60`	`60`	`// protoc and protoc-gen-grpc-java versions are selected to be compatible`
`61`	`61`	`// with the oldest supported versions of protoc and grpc artifacts.`
`62`	`62`	`protoc {`
`63`		`- artifact = 'com.google.protobuf:protoc:3.10.1' + (System.getProperty("os.arch") == 'aarch64' ? ':osx-x86_64' : '')`
	`63`	`+ artifact = 'com.google.protobuf:protoc:3.10.1' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '')`
`64`	`64`	`}`
`65`	`65`	`plugins {`
`66`	`66`	`grpc {`
`67`		`- artifact = 'io.grpc:protoc-gen-grpc-java:1.34.1' + (System.getProperty("os.arch") == 'aarch64' ? ':osx-x86_64' : '')`
	`67`	`+ 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' : '')`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`generateProtoTasks {`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,11 @@ protobuf {`
`62`	`62`	`// protoc and protoc-gen-grpc-java versions are selected to be compatible`
`63`	`63`	`// with the oldest supported versions of protoc and grpc artifacts.`
`64`	`64`	`protoc {`
`65`		`- artifact = 'com.google.protobuf:protoc:3.10.1' + (System.getProperty("os.arch") == 'aarch64' ? ':osx-x86_64' : '')`
	`65`	`+ artifact = 'com.google.protobuf:protoc:3.10.1' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '')`
`66`	`66`	`}`
`67`	`67`	`plugins {`
`68`	`68`	`grpc {`
`69`		`- artifact = 'io.grpc:protoc-gen-grpc-java:1.34.1' + (System.getProperty("os.arch") == 'aarch64' ? ':osx-x86_64' : '')`
	`69`	`+ 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' : '')`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`generateProtoTasks {`