Fix CI merge formatting test.
Fixes
We set the user name and email and a commit message in case a merge commit needs to be created.
@@ -59,7 +59,10 @@ jobs:
keys:
- go-mod-v1-{{ checksum "go.sum" }}
- - run: git merge origin/master
+ - run: |
+ git config user.name "Circle CI"
+ git config user.email "ci@mesosphere.com"
+ git merge -m "Merge Commit" origin/master
- run: make check-formatting
- save_cache:
key: go-mod-v1-{{ checksum "go.sum" }}
