summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre GRANDIN <grandinp@altern.org>2015-08-18 14:50:24 -0700
committerPierre GRANDIN <grandinp@altern.org>2015-08-18 14:50:24 -0700
commitfe892da3568a98ac1c544fc78c3964bd4e2624c2 (patch)
treedec36dafd39550bc23fb642c8276fe5143f0de57
parent5a2e23b6545511864c3764572b0b0235c660db25 (diff)
downloadnavit-fe892da3568a98ac1c544fc78c3964bd4e2624c2.tar.gz
Automerge successful translations imports to trunk
-rw-r--r--circle.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/circle.yml b/circle.yml
index bf2269d5d..4613b35fd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -73,6 +73,14 @@ deployment:
branch: trunk
commands:
- git push origin $CIRCLE_SHA1:refs/heads/master
+ merge_translations:
+ branch: /i18n.*/
+ owner: navit-gps
+ commands:
+ - git checkout trunk
+ - git checkout ${CIRCLE_BRANCH} po/*.po.in
+ - git commit -m "Automatic translation import from launchpad" po/*.po.in
+ - git push
notify:
webhooks:
- url: http://62.210.125.30:8000/