Support mac M1(osx-aarch_64) compile and test

Signed-off-by: crazyhzm <crazyhzm@apache.org>
sofastack · Apr 17, 2024 · 4f0c0fa · 4f0c0fa
1 parent 2ad93e1
commit 4f0c0fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
@@ -14,6 +14,7 @@
  <properties>
  <main.user.dir>${basedir}/../../..</main.user.dir>
  <sofa.rpc.compiler.version>0.0.3</sofa.rpc.compiler.version>
+ <protobuf.protoc.version>3.17.3</protobuf.protoc.version>
  </properties>
 
  <dependencies>
@@ -152,7 +153,7 @@
  <artifactId>protobuf-maven-plugin</artifactId>
  <version>0.5.1</version>
  <configuration>
- <protocArtifact>com.google.protobuf:protoc:3.7.1:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf.protoc.version}:exe:${os.detected.classifier}</protocArtifact>
  <pluginId>grpc-java</pluginId>
  <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
  <outputDirectory>build/generated/source/proto/test/java</outputDirectory>

diff --git a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml
@@ -32,6 +32,7 @@
  <properties>
  <main.user.dir>${basedir}/../../..</main.user.dir>
  <sofa.rpc.compiler.version>0.0.3</sofa.rpc.compiler.version>
+ <protobuf.protoc.version>3.17.3</protobuf.protoc.version>
  </properties>
 
  <dependencies>
@@ -115,7 +116,7 @@
  <artifactId>protobuf-maven-plugin</artifactId>
  <version>0.5.1</version>
  <configuration>
- <protocArtifact>com.google.protobuf:protoc:3.7.1:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf.protoc.version}:exe:${os.detected.classifier}</protocArtifact>
  <pluginId>grpc-java</pluginId>
  <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
  <outputDirectory>build/generated/source/proto/test/java</outputDirectory>