From 3e03ea1a500b61704ce6458eebf9a9ace89d8b78 Mon Sep 17 00:00:00 2001
From: Joseph Herlant <aerostitch@users.noreply.github.com>
Date: Thu, 19 Apr 2018 21:48:58 -0700
Subject: Add:CI:Re-add the merge to master job when circleci runs on trunk and
 is successful (#448)

---
 .circleci/config.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ab1b0dc6..4f34f5e50 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -154,6 +154,16 @@ jobs:
           name: Update Navit-Download-Center
           command: |
             bash ci/update_download_center.sh
+  merge_trunk_in_master:
+    <<: *defaults
+    steps:
+      - checkout
+      - run:
+          name: Install git
+          command: apt-get update && apt-get -y install ca-certificates git
+      - run:
+          name: Update results to Github
+          command: bash git push origin $CIRCLE_SHA1:refs/heads/master
 workflows:
   version: 2
   doxygen:
@@ -171,3 +181,9 @@ workflows:
       - build_wince
       - build_tomtom_minimal
       - build_tomtom_plugin
+  merge-to-master:
+    jobs:
+      - merge_trunk_in_master:
+          filters:
+            branches:
+              only: /^trunk$/
-- 
cgit v1.2.1