diff --git a/pom.xml b/pom.xml index 8d6592c..2828e60 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,11 @@ common-utils 1.0.3 + + it.tdlight + tdlight-natives-linux-amd64 + 1.0.3 + diff --git a/travis/deploy_master.sh b/travis/deploy_master.sh index c1b425b..79973f7 100644 --- a/travis/deploy_master.sh +++ b/travis/deploy_master.sh @@ -46,6 +46,7 @@ mv "$TRAVIS_BUILD_DIR/out/$SRC_LIBNAME" "src/main/resources/libs/$TRAVIS_OS_NAME # EXIT IF THE NATIVE LIBRARY ISN'T CHANGED if (git diff --exit-code "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD/$LIBNAME"); then + echo "Binaries are already updated." exit 0 fi @@ -61,3 +62,14 @@ git tag -a "v$NEW_VERSION" -m "Version $NEW_VERSION" git push origin "v$NEW_VERSION" git push mvn -B -V deploy + +# Upgrade the dependency of tdlight-java +cd ~/build +git clone git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git +cd tdlight-java +git checkout master +mvn versions:use-latest-releases -Dincludes=it.tdlight:tdlight-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD +rm pom.xml.versionsBackup +git add pom.xml +git commit -m "Upgrade $TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD natives" +git push diff --git a/travis/linux.sh b/travis/linux.sh index 9c052a9..dfb29fd 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -1,14 +1,6 @@ #!/bin/bash -e mkdir $TRAVIS_BUILD_DIR/out - -touch "$TRAVIS_BUILD_DIR/out/libtdjni.so" -exit 0 - -#sudo apt-get update -#sudo apt-get upgrade -#sudo apt-get install make git zlib1g-dev libssl-dev gperf php cmake default-jdk g++ ccache maven - cd src/main/jni export TD_SRC_DIR=${PWD}/td diff --git a/travis/win.sh b/travis/win.sh index c41b0e4..01e4da9 100644 --- a/travis/win.sh +++ b/travis/win.sh @@ -11,11 +11,6 @@ export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10" choco install openjdk11 --version=11.0.8.10 choco install maven --version=3.6.3 choco install base64 - -touch "$TRAVIS_BUILD_DIR/out/libtdjni.dll" -exit 0 - -# Build deps choco install gperf choco install strawberryperl