diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3bec681b4b8..d8b027e3266 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,9 +22,9 @@ name: Java CI with Maven on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: diff --git a/.travis.yml b/.travis.yml index 46236bc5a7a..95a6fe93bcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -language: java +--- +language: generic addons: + apt: + packages: + - openjdk-8-jdk + - unzip sonarcloud: organization: "kylin" token: @@ -27,21 +32,31 @@ cache: directories: - $HOME/.m2 -jdk: - - openjdk8 +jobs: + include: + - name: Linux ARM64 + arch: arm64-graviton2 + dist: focal + virt: vm + group: edge + - name: Linux x86 + arch: amd64 -before_script: - - echo "Downloading Maven 3.5.3" - && wget https://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/apache-maven-3.5.3-bin.zip - && unzip -qq apache-maven-3.5.3-bin.zip - && export M2_HOME=$PWD/apache-maven-3.5.3 - && export PATH=$M2_HOME/bin:$PATH - && mvn -version +before_install: + - export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-${TRAVIS_CPU_ARCH}"; + - export PATH="$JAVA_HOME/bin:$PATH"; + - echo "Downloading Maven 3.8.1" + - wget --quiet https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.zip + - unzip -qq -o apache-maven-3.8.1-bin.zip + - export M2_HOME=$PWD/apache-maven-3.8.1 + - export PATH=$M2_HOME/bin:$PATH + - mvn -version - echo "MAVEN_OPTS='-Xms1024m -Xmx3072m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m'" > ~/.mavenrc - sed -i 's/log4j.logger.org.apache.kylin=DEBUG/log4j.logger.org.apache.kylin=WARN/g' build/conf/kylin-server-log4j.properties - sed -i 's/log4j.logger.org.apache.kylin=INFO/log4j.logger.org.apache.kylin=WARN/g' build/conf/kylin-tools-log4j.properties - sed -i 's/log4j.logger.org.apache.kylin=INFO/log4j.logger.org.apache.kylin=WARN/g' kylin-spark-project/build/conf/kylin-tools-log4j.properties + - if [[ $(uname -m) == 'aarch64' ]];then export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-arm64";fi script: # mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test coveralls:report -e @@ -63,7 +78,7 @@ notification: after_success: - bash <(curl -s https://codecov.io/bash) - + before_cache: # Remove project's local artifacts to force maven reactor resolve - rm -rf $HOME/.m2/repository/org/apache/kylin @@ -71,4 +86,4 @@ before_cache: # blocklist branches: except: - - document + - document diff --git a/pom.xml b/pom.xml index 1b794fddfe5..8b5ae853f53 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ 7.0.100 3.1 2.3.23 - 5.9.2 + 5.18.4 1.4.0 6.2.2.jre8