trying another fix for travis

This commit is contained in:
Eric House 2018-12-16 17:43:12 -08:00
parent 02f37009d2
commit d31c2f5513
2 changed files with 6 additions and 5 deletions

View file

@ -35,8 +35,8 @@ before_install:
- sudo apt-get install -y python-lxml imagemagick - sudo apt-get install -y python-lxml imagemagick
script: script:
- "./gradlew -PuseCrashlytics asXw4dDeb" - "./gradlew -PuseCrashlytics asXw4dDeb"
- NAME=$(find app/build/outputs/apk/xw4d/debug -name '*.apk') - scp -o "StrictHostKeyChecking no" -i /tmp/id_rsa_uploader -d app/build/outputs/apk/xw4d/debug/*.apk
- scp -o "StrictHostKeyChecking no" -i /tmp/id_rsa_uploader -d $NAME uploader@eehouse.org:XW4D_UPLOAD/$(basename $NAME) uploader@eehouse.org:XW4D_UPLOAD
notifications: notifications:
email: email:
recipients: recipients:

View file

@ -10,11 +10,12 @@ boolean forFDroid = hasProperty('forFDroid')
// Get the git revision we're using. Since fdroid modifies files as // Get the git revision we're using. Since fdroid modifies files as
// part of its build process -dirty will always be added, confusing // part of its build process -dirty will always be added, confusing
// users. So add that for the non-fdroid case. // users. So add that for the non-fdroid case.
def GITREV = "git describe --tags" def GITCMD = "git describe --tags"
if (! forFDroid) { if (! forFDroid) {
GITREV += " --dirty" GITCMD += " --dirty"
} }
GITREV = GITREV.execute().text.trim() def GITREV = GITCMD.execute().text.trim()
print "GITREV: ${GITREV}\n"
apply plugin: 'com.android.application' apply plugin: 'com.android.application'