From 19581792fcf1e140ca3f4d08df9e0e148d9aecb9 Mon Sep 17 00:00:00 2001
From: arkon <arkon@users.noreply.github.com>
Date: Sun, 11 Oct 2020 12:31:33 -0400
Subject: [PATCH] [SKIP CI] Remove dev build logic from Travis CI config
 (#3873)

---
 .travis.yml       | 14 --------------
 .travis/build.sh  | 21 +++++----------------
 .travis/deploy.sh | 15 ---------------
 3 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100755 .travis/deploy.sh

diff --git a/.travis.yml b/.travis.yml
index bb43fcb22f..ae2123bd60 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 049fd015be..273d7eb78a 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 c952226148..0000000000
--- 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