summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Herlant <aerostitch@users.noreply.github.com>2018-04-20 04:51:26 -0700
committerjkoan <jkoan@users.noreply.github.com>2018-04-20 13:51:26 +0200
commit1670e14c1169218af450753de279b6d7b99e83c3 (patch)
treed808fdc5bf3095c1f6dee8c376e3f68238961ad0
parent2b62dacf700245f4f8f627695e1251f403a4b12b (diff)
downloadnavit-1670e14c1169218af450753de279b6d7b99e83c3.tar.gz
Fix:CI:Put merge-to-master in the build workflow to use requires (#450)
-rw-r--r--.circleci/config.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f1669359..e5defc266 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -184,8 +184,6 @@ workflows:
- build_wince
- build_tomtom_minimal
- build_tomtom_plugin
- merge-to-master:
- jobs:
- merge_trunk_in_master:
requires:
- build_linux