MAINT: Cleaner vars [skip azp] [skip actions] [skip appveyor]

larsoner · larsoner · commit d25357a93308 · 2021-07-20T13:03:55.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,11 +14,10 @@ commands:
       - run:
           name: Check-skip
           command: |
-            git log --max-count=1 --pretty=format:"%B" | tr "\n" " " > commit_message.txt
-            export COMMIT_MESSAGE=$(cat commit_message.txt);
+            export git_log=$(git log --max-count=1 --pretty=format:"%B" | tr "\n" " ")
             echo "Got commit message:"
-            echo "${COMMIT_MESSAGE}"
-            if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$COMMIT_MESSAGE" == *"[skip circle]"* ]] || [[ "$COMMIT_MESSAGE" == *"[circle skip]"* ]]); then
+            echo "${git_log}"
+            if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$git_log" == *"[skip circle]"* ]] || [[ "$git_log" == *"[circle skip]"* ]]); then
               echo "Skip detected, exiting job ${CIRCLE_JOB} for PR ${CIRCLE_PULL_REQUEST}."
               circleci-agent step halt;
             fi
@@ -32,10 +31,10 @@ commands:
               git remote add upstream git://github.com/matplotlib/matplotlib.git
             fi
             git fetch upstream
-            echo ${CI_PULL_REQUEST//*pull\//} | tee merge.txt
-            if [[ $(cat merge.txt) != "" ]]; then
-              echo "Merging $(cat merge.txt)";
-              git pull --ff-only upstream "refs/pull/$(cat merge.txt)/merge";
+            export merge=${CI_PULL_REQUEST//*pull\//}
+            if [[ "$merge" != "" ]]; then
+              echo "Merging ${merge})";
+              git pull --ff-only upstream "refs/pull/${merge}/merge";
             fi
 
   apt-install:
