summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-14 00:44:31 +1000
committerGitHub <noreply@github.com>2018-09-14 00:44:31 +1000
commit3126b88d35994b09096239462abbbbcd17d9cbf0 (patch)
tree5a022255a93a48535890ec5eb3e18c56c267aada
parentAttempt to figure out what's going on with timeouts (#3857) (diff)
downloadsynapse-3126b88d35994b09096239462abbbbcd17d9cbf0.tar.xz
fix circleci merged builds (#3858)
* fix

* changelog
-rwxr-xr-x.circleci/merge_base_branch.sh4
-rw-r--r--changelog.d/3858.misc1
2 files changed, 5 insertions, 0 deletions
diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh
index 4e297d77da..9614eb91b6 100755
--- a/.circleci/merge_base_branch.sh
+++ b/.circleci/merge_base_branch.sh
@@ -19,6 +19,10 @@ GITBASE=`curl -q https://api.github.com/repos/matrix-org/synapse/pulls/${CIRCLE_
 # Show what we are before
 git show -s
 
+# Set up username so it can do a merge
+git config --global user.email bot@matrix.org
+git config --global user.name "A robot"
+
 # Fetch and merge. If it doesn't work, it will raise due to set -e.
 git fetch -u origin $GITBASE
 git merge --no-edit origin/$GITBASE
diff --git a/changelog.d/3858.misc b/changelog.d/3858.misc
new file mode 100644
index 0000000000..4644db5330
--- /dev/null
+++ b/changelog.d/3858.misc
@@ -0,0 +1 @@
+Fix running merged builds on CircleCI
\ No newline at end of file