Update .travis.yml, deploy_master.sh, and 2 more files...
This commit is contained in:
parent
93422fb7d9
commit
829b93997c
@ -40,10 +40,12 @@ deploy:
|
|||||||
skip-cleanup: true
|
skip-cleanup: true
|
||||||
github-token: $GITHUB_TOKEN
|
github-token: $GITHUB_TOKEN
|
||||||
keep-history: true
|
keep-history: true
|
||||||
local-dir: out
|
local-dir: out/docs
|
||||||
repo: tdlight-team/tdlib-docs
|
repo: tdlight-team/tdlib-docs
|
||||||
on:
|
target_branch: master
|
||||||
branch: master
|
email: andrea@cavallium.it
|
||||||
|
name: "Andrea Cavalli"
|
||||||
|
verbose: true
|
||||||
# - provider: script
|
# - provider: script
|
||||||
# skip-cleanup: true
|
# skip-cleanup: true
|
||||||
# script: "mvn -B -V deploy"
|
# script: "mvn -B -V deploy"
|
||||||
|
@ -59,7 +59,7 @@ git config --global user.name "Andrea Cavalli"
|
|||||||
|
|
||||||
# Prepare repository
|
# Prepare repository
|
||||||
cd $TRAVIS_BUILD_DIR
|
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"
|
cd "tdlight-java-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD"
|
||||||
SRC_LIBNAME=""
|
SRC_LIBNAME=""
|
||||||
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
|
# Upgrade the dependency of tdlight-java
|
||||||
cd $TRAVIS_BUILD_DIR
|
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
|
cd tdlight-java
|
||||||
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
|
||||||
@ -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
|
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
|
||||||
|
|
||||||
|
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
|
cd $TRAVIS_BUILD_DIR/tdlight-java
|
||||||
git pull
|
git pull
|
||||||
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
|
||||||
|
@ -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
|
cmake --build $TDNATIVES_CPP_BUILD_DIR --target install -- -j2
|
||||||
|
|
||||||
mv $TDNATIVES_BIN_DIR/libtdjni.so $TRAVIS_BUILD_DIR/out/libtdjni.so
|
mv $TDNATIVES_BIN_DIR/libtdjni.so $TRAVIS_BUILD_DIR/out/libtdjni.so
|
||||||
|
mv $TDNATIVES_DOCS_BIN_DIR $TRAVIS_BUILD_DIR/out/docs
|
||||||
|
@ -38,7 +38,7 @@ choco install gperf
|
|||||||
choco install strawberryperl
|
choco install strawberryperl
|
||||||
choco install nasm
|
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
|
mv windowsenv/vcpkg $VCPKG_DIR
|
||||||
|
|
||||||
# ====== Build Td
|
# ====== Build Td
|
||||||
|
Loading…
Reference in New Issue
Block a user