diff --git a/.travis.yml b/.travis.yml index bb43fcb22..ae2123bd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,20 +55,6 @@ deploy: on: tags: true repo: inorichi/tachiyomi - - provider: script - script: ".travis/deploy.sh" - skip_cleanup: true - on: - branch: master - condition: "-z $TRAVIS_TAG" - repo: inorichi/tachiyomi - - provider: script - script: ".travis/deploy.sh" - skip_cleanup: true - on: - branch: dev - condition: "-z $TRAVIS_TAG" - repo: inorichi/tachiyomi env: global: diff --git a/.travis/build.sh b/.travis/build.sh index 049fd015b..273d7eb78 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,20 +1,9 @@ #!/bin/bash -git fetch --unshallow #required for commit count +./gradlew clean assembleStandardRelease -if [ -z "$TRAVIS_TAG" ]; then - ./gradlew clean assembleStandardDebug +TOOLS="$(ls -d ${ANDROID_HOME}/build-tools/* | tail -1)" +export ARTIFACT="tachiyomi-${TRAVIS_TAG}.apk" - COMMIT_COUNT=$(git rev-list --count HEAD) - export ARTIFACT="tachiyomi-r${COMMIT_COUNT}.apk" - - mv app/build/outputs/apk/standard/debug/app-standard-debug.apk $ARTIFACT -else - ./gradlew clean assembleStandardRelease - - TOOLS="$(ls -d ${ANDROID_HOME}/build-tools/* | tail -1)" - export ARTIFACT="tachiyomi-${TRAVIS_TAG}.apk" - - ${TOOLS}/zipalign -v -p 4 app/build/outputs/apk/standard/release/app-standard-release-unsigned.apk app-aligned.apk - ${TOOLS}/apksigner sign --ks $STORE_PATH --ks-key-alias $STORE_ALIAS --ks-pass env:STORE_PASS --key-pass env:KEY_PASS --out $ARTIFACT app-aligned.apk -fi +${TOOLS}/zipalign -v -p 4 app/build/outputs/apk/standard/release/app-standard-release-unsigned.apk app-aligned.apk +${TOOLS}/apksigner sign --ks $STORE_PATH --ks-key-alias $STORE_ALIAS --ks-pass env:STORE_PASS --key-pass env:KEY_PASS --out $ARTIFACT app-aligned.apk diff --git a/.travis/deploy.sh b/.travis/deploy.sh deleted file mode 100755 index c95222614..000000000 --- a/.travis/deploy.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -pattern="tachiyomi-r*" -files=( $pattern ) -export ARTIFACT="${files[0]}" - -if [ -z "$ARTIFACT" ]; then - echo "Artifact not found" - exit 1 -fi - -export SSHOPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${DEPLOY_KEY}" - -scp $SSHOPTIONS $ARTIFACT $DEPLOY_USER@$DEPLOY_HOST:builds/ -ssh $SSHOPTIONS $DEPLOY_USER@$DEPLOY_HOST ln -sf $ARTIFACT builds/latest