Update deploy_master.sh

This commit is contained in:
Andrea 2020-08-19 11:53:04 +02:00
parent 294e5ae97a
commit 7d1d1a64af

View File

@ -90,9 +90,8 @@ if ! (git diff --exit-code "src/main/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVI
# Upgrade the dependency of tdlight-java # Upgrade the dependency of tdlight-java
cd $TRAVIS_BUILD_DIR cd $TRAVIS_BUILD_DIR
git clone git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git git clone -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git
cd tdlight-java cd tdlight-java
git checkout master
mvn versions:use-latest-releases -Dincludes=it.tdlight:tdlight-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD mvn versions:use-latest-releases -Dincludes=it.tdlight:tdlight-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD
rm pom.xml.versionsBackup rm pom.xml.versionsBackup
git add pom.xml git add pom.xml
@ -112,10 +111,8 @@ if [ "$TRAVIS_OS_NAME_STANDARD" = "linux" ]; then
unexpand --tabs=2 $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java > $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java unexpand --tabs=2 $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java > $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java
rm $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java rm $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java
cd $TRAVIS_BUILD_DIR cd $TRAVIS_BUILD_DIR/tdlight-java
git clone git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git || true git pull
cd tdlight-java
git checkout master
cp $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java src/main/java/it/tdlight/tdnatives/TdApi.java cp $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java src/main/java/it/tdlight/tdnatives/TdApi.java
# IF TdApi.java IS CHANGED # IF TdApi.java IS CHANGED