Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

fix circleci merged builds #3858

Merged
merged 2 commits into from
Sep 13, 2018
Merged

fix circleci merged builds #3858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa9f5e1
fix
hawkowl Sep 13, 2018
38cdf65
changelog
hawkowl Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .circleci/merge_base_branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]
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
Expand Down
1 change: 1 addition & 0 deletions changelog.d/3858.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix running merged builds on CircleCI