diff options
| author | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-04-20 04:30:56 -0700 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2018-04-20 13:30:56 +0200 |
| commit | 2b62dacf700245f4f8f627695e1251f403a4b12b (patch) | |
| tree | d0e65fc352df8dfb391bab1e489378e974aa75d8 | |
| parent | a2e763e90cfb19d7ae1e6c0899e83dcde85e2a0f (diff) | |
| download | navit-2b62dacf700245f4f8f627695e1251f403a4b12b.tar.gz | |
fix:ci:Fix the merge to master in circleci and require that all build passed (#449)
* Add:CI:Make sure that the build jobs all succeed before merging to master
* Add:CI:Add the ssh fingerprint for github.com to avoid issues
| -rw-r--r-- | .circleci/config.yml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index e0a346931..7f1669359 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -161,6 +161,9 @@ jobs: - run: name: Install git command: apt-get update && apt-get -y install ca-certificates git + - add_ssh_keys: + fingerprints: + - "16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48" - run: name: Update results to Github command: git push origin $CIRCLE_SHA1:refs/heads/master @@ -184,6 +187,14 @@ workflows: merge-to-master: jobs: - merge_trunk_in_master: + requires: + - build_linux + - build_android_arm + - build_android_x86 + - build_win32 + - build_wince + - build_tomtom_minimal + - build_tomtom_plugin filters: branches: only: /^trunk$/ |