diff --git a/.travis.yml b/.travis.yml index 8535893..e46c497 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,10 +40,12 @@ deploy: skip-cleanup: true github-token: $GITHUB_TOKEN keep-history: true - local-dir: out + local-dir: out/docs repo: tdlight-team/tdlib-docs - on: - branch: master + target_branch: master + email: andrea@cavallium.it + name: "Andrea Cavalli" + verbose: true # - provider: script # skip-cleanup: true # script: "mvn -B -V deploy" diff --git a/travis/deploy_master.sh b/travis/deploy_master.sh index fcad406..df23a33 100644 --- a/travis/deploy_master.sh +++ b/travis/deploy_master.sh @@ -59,7 +59,7 @@ git config --global user.name "Andrea Cavalli" # Prepare repository cd $TRAVIS_BUILD_DIR -git clone "git@ssh.git.ignuranza.net:tdlight-team/tdlight-java-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD.git" +git clone --depth=1 "git@ssh.git.ignuranza.net:tdlight-team/tdlight-java-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD.git" cd "tdlight-java-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD" SRC_LIBNAME="" LIBNAME="" @@ -90,7 +90,7 @@ if ! (git diff --exit-code "src/main/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVI # Upgrade the dependency of tdlight-java cd $TRAVIS_BUILD_DIR - git clone -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git + git clone --depth=1 -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git || true cd tdlight-java mvn versions:use-latest-releases -Dincludes=it.tdlight:tdlight-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD rm pom.xml.versionsBackup @@ -111,6 +111,7 @@ 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 rm $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java + git clone --depth=1 -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git || true cd $TRAVIS_BUILD_DIR/tdlight-java git pull cp $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java src/main/java/it/tdlight/tdnatives/TdApi.java diff --git a/travis/linux.sh b/travis/linux.sh index 7d324df..3d19198 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -46,3 +46,4 @@ cmake -DCMAKE_BUILD_TYPE=Release -DTD_BIN_DIR=${TD_BIN_DIR} -DTDNATIVES_BIN_DIR= cmake --build $TDNATIVES_CPP_BUILD_DIR --target install -- -j2 mv $TDNATIVES_BIN_DIR/libtdjni.so $TRAVIS_BUILD_DIR/out/libtdjni.so +mv $TDNATIVES_DOCS_BIN_DIR $TRAVIS_BUILD_DIR/out/docs diff --git a/travis/win.sh b/travis/win.sh index 27d9eeb..ee2fd2b 100644 --- a/travis/win.sh +++ b/travis/win.sh @@ -38,7 +38,7 @@ choco install gperf choco install strawberryperl choco install nasm -git clone -b windows-amd64-prebuilt-libraries --single-branch https://github.com/tdlight-team/tdlight-java windowsenv +git clone --depth=1 -b windows-amd64-prebuilt-libraries --single-branch https://github.com/tdlight-team/tdlight-java windowsenv mv windowsenv/vcpkg $VCPKG_DIR # ====== Build Td