Merge pull request #20709 from QuLogic/fix-circle-merge

jklymak · web-flow · commit 1a8caa557dec · 2021-07-21T14:22:09.000-07:00
Fix Circle merge on master branch.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,10 +31,10 @@ commands:
               git remote add upstream git://github.com/matplotlib/matplotlib.git
             fi
             git fetch upstream
-            export merge=${CI_PULL_REQUEST//*pull\//}
-            if [[ "$merge" != "" ]]; then
-              echo "Merging ${merge}";
-              git pull --ff-only upstream "refs/pull/${merge}/merge";
+            if [[ "$CIRCLE_BRANCH" != "master" ]] && \
+               [[ "$CIRCLE_PR_NUMBER" != "" ]]; then
+              echo "Merging ${CIRCLE_PR_NUMBER}"
+              git pull --ff-only upstream "refs/pull/${CIRCLE_PR_NUMBER}/merge"
             fi
 
   apt-install:
