CircleCi: merge PRs with upstream branch

circle.yml

@@ -9,6 +9,7 @@ test:
     - make -f posix.mak style
     - ./circleci.sh coverage:
         parallel: true
+        timeout: 1200
 
   post:
     # CodeCov gets confused by stored .lst files

circleci.sh

@@ -5,6 +5,7 @@ set -uexo pipefail
 HOST_DMD_VER=2.068.2 # same as in dmd/src/posix.mak
 CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
 N=2
+CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
 
 case $CIRCLE_NODE_INDEX in
     0) MODEL=64 ;;
@@ -39,7 +40,7 @@ clone() {
     local path="$2"
     local branch="$3"
     for i in {0..4}; do
-        if git clone --depth=1 --branch "$branch" "$url" "$path"; then
+        if git clone --branch "$branch" "$url" "$path" "${@:4}"; then
             break
         elif [ $i -lt 4 ]; then
             sleep $((1 << $i))
@@ -57,7 +58,19 @@ coverage() {
         local base_branch=$CIRCLE_BRANCH
     fi
 
-    clone https://github.com/dlang/dmd.git ../dmd $base_branch
+   # merge upstream branch with changes, s.t. we check with the latest changes
+    if [ -n "${CIRCLE_PR_NUMBER:-}" ]; then
+        local current_branch=$(git rev-parse --abbrev-ref HEAD)
+        git config user.name dummyuser
+        git config user.email dummyuser@dummyserver.com
+        git remote add upstream https://github.com/dlang/druntime.git
+        git fetch upstream
+        git checkout -f upstream/$base_branch
+        git merge -m "Automatic merge" $current_branch
+    fi
+
+
+    clone https://github.com/dlang/dmd.git ../dmd $base_branch --depth 1
 
     # load environment for bootstrap compiler
     source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"