diff options
| author | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-04-19 21:48:58 -0700 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2018-04-19 21:48:58 -0700 |
| commit | 3e03ea1a500b61704ce6458eebf9a9ace89d8b78 (patch) | |
| tree | 32eea7d4f1f03e2ee5183916aac365503ce78a35 | |
| parent | c1fd3f5b02916e945e5a44a30ecac366c5d4e9d8 (diff) | |
| download | navit-3e03ea1a500b61704ce6458eebf9a9ace89d8b78.tar.gz | |
Add:CI:Re-add the merge to master job when circleci runs on trunk and is successful (#448)
| -rw-r--r-- | .circleci/config.yml | 16 |
1 files changed, 16 insertions, 0 deletions
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$/ |