diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-05 10:27:27 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-07-05 10:27:27 -0700 |
| commit | a34f071efcd8f17866fdec95e9c80482c9a7ab1d (patch) | |
| tree | fdf4c4247a8a645bf22d961f9243c0f6cd2555ef | |
| parent | f66e5981b83951b0fe142b6c74ddbff6f61b55be (diff) | |
| download | frost-a34f071efcd8f17866fdec95e9c80482c9a7ab1d.tar.gz frost-a34f071efcd8f17866fdec95e9c80482c9a7ab1d.tar.bz2 frost-a34f071efcd8f17866fdec95e9c80482c9a7ab1d.zip | |
Test build since tag
| -rw-r--r-- | .idea/misc.xml | 2 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | app/build.gradle | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml index 7319f021..085136f8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -53,7 +53,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/.travis.yml b/.travis.yml index 03906805..4c247eda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,11 @@ before_install: - tar xvf frost.tar - chmod +x gradlew after_success: +- ./gradlew androidGitVersion - if [[ "$TRAVIS_BRANCH" != "master" ]]; then chmod +x ./generate-apk-release.sh; ./generate-apk-release.sh; fi script: - cd $TRAVIS_BUILD_DIR/ -- if [[ "$TRAVIS_BRANCH" == "master" ]]; then ./gradlew app:publishRelease; else ./gradlew assembleReleaseTest; fi +- if [[ "$TRAVIS_BRANCH" == "master" ]]; then ./gradlew publishRelease; else ./gradlew assembleReleaseTest; fi notifications: email: false slack: diff --git a/app/build.gradle b/app/build.gradle index 8e6b32ad..fdac8fa3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,11 +21,11 @@ android { compileSdkVersion Integer.parseInt(project.TARGET_SDK) buildToolsVersion project.BUILD_TOOLS - def offset = Integer.parseInt(System.getenv("TRAVIS_BUILD_NUMBER") ?: "0") +// def offset = Integer.parseInt(System.getenv("TRAVIS_BUILD_NUMBER") ?: "0") androidGitVersion { - baseCode offset - codeFormat = 'MMNNPPXX' +// baseCode offset + codeFormat = 'MMNNPPBB' //since we use travis, all builds will be dirty format = '%tag%%.count%%-commit%' prefix 'v' |