FIX: Dont skip one [skip azp] [skip appveyor] [skip actions]

larsoner · larsoner · commit 42fe53cc7eb3 · 2021-07-19T15:38:06.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,6 +9,20 @@ version: 2.1
 #
 
 commands:
+  check-skip:
+    steps:
+      - 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);
+            echo "Got commit message:"
+            echo "${COMMIT_MESSAGE}"
+            if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$COMMIT_MESSAGE" == *"[skip circle]"* ]] || [[ "$COMMIT_MESSAGE" == *"[circle skip]"* ]]); then
+              echo "Skip detected, exiting job ${CIRCLE_JOB} for PR ${CIRCLE_PULL_REQUEST}."
+              circleci-agent step halt;
+            fi
+
   merge:
     steps:
       - run:
@@ -24,20 +38,6 @@ commands:
               git pull --ff-only upstream "refs/pull/$(cat merge.txt)/merge";
             fi
 
-  check-skip:
-    steps:
-      - run:
-          name: Check-skip
-          command: |
-            git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " " > commit_message.txt
-            export COMMIT_MESSAGE=$(cat commit_message.txt);
-            echo "Got commit message:"
-            echo "${COMMIT_MESSAGE}"
-            if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$COMMIT_MESSAGE" == *"[skip circle]"* ]] || [[ "$COMMIT_MESSAGE" == *"[circle skip]"* ]]); then
-              echo "Skip detected, exiting job ${CIRCLE_JOB} for PR ${CIRCLE_PULL_REQUEST}."
-              circleci-agent step halt;
-            fi
-
   apt-install:
     steps:
       - run:
