From 4c815e3786899bba3201d5c45bef9516971a9df0 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 18 Aug 2020 17:27:52 +0200 Subject: [PATCH] Update .travis.yml, pom.xml, and deploy_master.sh --- .travis.yml | 7 +------ pom.xml | 6 +++--- travis/deploy_master.sh | 20 ++++++++++++++++++-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 103233c..664b967 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,6 @@ arch: - amd64 - arm64 -jobs: - include: - - stage: deploy - name: "Deploy binaries to master" - script: "bash travis/deploy_master.sh" - cache: bundler: true cocoapods: true @@ -47,4 +41,5 @@ script: | if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then bash travis/win.sh; fi + bash travis/deploy_master.sh diff --git a/pom.xml b/pom.xml index c239e55..8d6592c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - it.ernytech - tdlib + it.tdlight + tdlight-java 2.168.0 - JTDLib + TDLight Java Wrapper jar UTF-8 diff --git a/travis/deploy_master.sh b/travis/deploy_master.sh index 74736ef..c07e33a 100644 --- a/travis/deploy_master.sh +++ b/travis/deploy_master.sh @@ -1,5 +1,21 @@ #!/bin/bash -e -echo "Deployed" -echo "$TRAVIS_OS_NAME" +if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then + export TRAVIS_CPU_ARCH_STANDARD="aarch64" +else + export TRAVIS_CPU_ARCH_STANDARD="${TRAVIS_CPU_ARCH,,}" +fi +export TRAVIS_OS_NAME_STANDARD="${TRAVIS_OS_NAME,,}" + +echo "TRAVIS_OS_NAME: $TRAVIS_OS_NAME" +echo "TRAVIS_OS_NAME_STANDARD: $TRAVIS_OS_NAME_STANDARD" +echo "TRAVIS_CPU_ARCH: $TRAVIS_CPU_ARCH" +echo "TRAVIS_CPU_ARCH_STANDARD: $TRAVIS_CPU_ARCH_STANDARD" + +echo "$GIT_IGN_TRAVIS_DEPLOY_PRIVATE_KEY" > ~/.ssh/id_rsa + +git clone "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" +ls -alch + ls -alch $TRAVIS_BUILD_DIR/out ls -alch $TRAVIS_BUILD_DIR