mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-27 07:58:49 +01:00
trying to not have all travis builds show "dirty"
This commit is contained in:
parent
4fef4e4b29
commit
d5c706fb07
2 changed files with 4 additions and 5 deletions
|
@ -35,8 +35,9 @@ before_install:
|
|||
- sudo apt-get -qq update
|
||||
- sudo apt-get install -y python3-lxml imagemagick
|
||||
script:
|
||||
- GITREV="$(git describe --tags --dirty)"
|
||||
- sed -i -e '/\/\/ rm-for-fdroid$/d' {.,app}/build.gradle
|
||||
- ./gradlew asXw4dDeb
|
||||
- ./gradlew asXw4dDeb -PGITREV="$GITREV"
|
||||
- scp -o "StrictHostKeyChecking no" -i /tmp/id_rsa_uploader -d app/build/outputs/apk/*/debug/*.apk
|
||||
uploader@eehouse.org:XW4D_UPLOAD
|
||||
notifications:
|
||||
|
|
|
@ -37,11 +37,9 @@ boolean forFDroid = hasProperty('forFDroid')
|
|||
// Get the git revision we're using. Since fdroid modifies files as
|
||||
// part of its build process -dirty will always be added, confusing
|
||||
// users. So add that for the non-fdroid case.
|
||||
def GITREV = "git describe --tags"
|
||||
if (! forFDroid) {
|
||||
GITREV += " --dirty"
|
||||
if (! project.hasProperty('GITREV')) {
|
||||
ext.GITREV = 'git describe --tags --dirty'.execute().text.trim()
|
||||
}
|
||||
GITREV = GITREV.execute().text.trim()
|
||||
def GITREV_SHORT = "git rev-parse --short HEAD".execute().text.trim()
|
||||
|
||||
// Make CURTAG non-empty IFF we're at a tag (release build)
|
||||
|
|
Loading…
Add table
Reference in a new issue