浏览代码

CI: Polish dependencies for ARM64 and add ARM64 job to Travis CI (#1765)

1. Added ARM64 architecture in .travis.yml
2. Updated 'embedded-consul' version to 2.2.0, 'consul-api' version to 1.4.5 for ARM64 support.
3. Updated grpc.version for 'io.grpc:protoc-gen-grpc-java' to 1.30.2, for ARM64 support.

Signed-off-by: odidev <odidev@puresoftware.com>
master
odidev GitHub 4 年前
父节点
当前提交
8c4f251922
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 4 个文件被更改,包括 19 次插入7 次删除
  1. +6
    -0
      .travis.yml
  2. +2
    -2
      sentinel-adapter/sentinel-grpc-adapter/pom.xml
  3. +2
    -2
      sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml
  4. +9
    -3
      sentinel-extension/sentinel-datasource-consul/pom.xml

+ 6
- 0
.travis.yml 查看文件

@@ -9,11 +9,17 @@ matrix:
env: BUILD_JDK=ORACLE_JDK_8
- jdk: oraclejdk11
env: BUILD_JDK=ORACLE_JDK_11
- arch: arm64
allow_failures:
- env: BUILD_JDK=ORACLE_JDK_11

# https://docs.travis-ci.com/user/languages/java/#maven-dependency-management
install:
- if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
sudo apt-get install -y maven openjdk-11-jdk;
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-arm64;
export PATH=$JAVA_HOME/bin:$PATH;
fi
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -DminimumPriority=1

after_success:


+ 2
- 2
sentinel-adapter/sentinel-grpc-adapter/pom.xml 查看文件

@@ -12,7 +12,7 @@
<packaging>jar</packaging>

<properties>
<grpc.version>1.13.1</grpc.version>
<grpc.version>1.30.2</grpc.version>
</properties>

<dependencies>
@@ -95,4 +95,4 @@
</plugin>
</plugins>
</build>
</project>
</project>

+ 2
- 2
sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml 查看文件

@@ -16,7 +16,7 @@
<java.target.version>1.8</java.target.version>

<protobuf.version>3.10.0</protobuf.version>
<grpc.version>1.24.0</grpc.version>
<grpc.version>1.30.2</grpc.version>

<maven.shade.version>3.2.1</maven.shade.version>
</properties>
@@ -158,4 +158,4 @@
</build>
</profile>
</profiles>
</project>
</project>

+ 9
- 3
sentinel-extension/sentinel-datasource-consul/pom.xml 查看文件

@@ -15,11 +15,17 @@
<properties>
<java.source.version>1.8</java.source.version>
<java.target.version>1.8</java.target.version>
<consul.version>1.4.2</consul.version>
<consul.process.version>2.0.0</consul.process.version>
<consul.version>1.4.5</consul.version>
<consul.process.version>2.2.0</consul.process.version>
</properties>

<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-xml</artifactId>
<version>3.0.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-extension</artifactId>
@@ -46,4 +52,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>

正在加载...
取消
保存