CI: Merge CircleCI for PRs

Joezhaonn · May 23, 2019 · a64595a · a64595a
1 parent d5617d8
commit a64595a
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,6 +11,18 @@ jobs:
     steps:
       - checkout
 
+      - run:
+          name: merge with upstream
+          command: |
+            echo $(git log -1 --pretty=%B) | tee gitlog.txt
+            echo ${CI_PULL_REQUEST//*pull\//} | tee merge.txt
+            if [[ $(cat merge.txt) != "" ]]; then
+              echo "Merging $(cat merge.txt)";
+              git remote add upstream git://github.com/scipy/scipy.git;
+              git pull --ff-only upstream "refs/pull/$(cat merge.txt)/merge";
+              git fetch upstream master;
+            fi
+
       - run:
           name: update submodules
           command: |