summaryrefslogtreecommitdiff
path: root/circle.yml
diff options
context:
space:
mode:
authormdankov <mdankov@users.noreply.github.com>2015-09-03 00:33:12 +0300
committerMichael Dankov <tryagain@navit-project.org>2015-09-07 00:27:32 +0300
commit8010d315a3e9c077dd33099592bd85155f6eb154 (patch)
tree8c570cdaa2b1b0a63229a91e3a668da558732968 /circle.yml
parent2c7794fe266b4db6d19c9f768bafa45af1ed73b3 (diff)
downloadnavit-8010d315a3e9c077dd33099592bd85155f6eb154.tar.gz
Store "revision number" as Rnnnn tags
Store revision number derived from CircleCI build number in git tags Rnnnn. Use number derived from the last Rnnnn tag for android:versionCode of AndroidManifest.xml.
Diffstat (limited to 'circle.yml')
-rw-r--r--circle.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/circle.yml b/circle.yml
index 0f557e94b..6e10b8c12 100644
--- a/circle.yml
+++ b/circle.yml
@@ -24,6 +24,7 @@ dependencies:
- sudo apt-get install libfreetype6-dev
- sudo apt-get install libdbus-glib-1-dev
- sudo apt-get install g++
+ - bash ci/update_version.sh prepare
- bash ci/import_translations.sh
- bash ci/build_linux.sh
- sed -i '/INTEGER/d' bin/po/navit.pot
@@ -72,6 +73,7 @@ deployment:
merge_into_master:
branch: trunk
commands:
+ - bash ci/update_version.sh push
- git push origin $CIRCLE_SHA1:refs/heads/master
merge_translations:
branch: /i18n.*/