Skip to content

Added ARM64 support to Sentinel and added ARM64 job to Travis-CI #1765

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.

Sign up for GitHub

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

Merged
sczyh30 merged 1 commit into from
Nov 9, 2020
Merged

Added ARM64 support to Sentinel and added ARM64 job to Travis-CI #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions sentinel-adapter/sentinel-grpc-adapter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<packaging>jar</packaging>

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

<dependencies>
Expand Down Expand Up @@ -95,4 +95,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -158,4 +158,4 @@
</build>
</profile>
</profiles>
</project>
</project>
12 changes: 9 additions & 3 deletions sentinel-extension/sentinel-datasource-consul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -46,4 +52,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>