diff --git a/.circleci/config.yml b/.circleci/config.yml
index 24a7798f..0b2a4708 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,9 +58,6 @@ jobs:
           root: .
           paths:
             - packages/*/build/*
-      - run:
-          name: Format text
-          command: yarn format-text
       - run:
           name: Check for clean workspace
           command: |
@@ -480,4 +477,22 @@ jobs:
           paths:
             - ~/.cache/yarn
       - run:
+          name: Lint
           command: yarn lint
+      - run:
+          name: Format text
+          command: yarn format-text
+      - run:
+          name: Format shell scripts
+          command: yarn format-shell
+      - run:
+          name: Check for clean workspace
+          command: |
+            SOURCE_CHANGES=$(git status --porcelain)
+            if [[ -n "$SOURCE_CHANGES" ]]; then
+              echo "Error: repository contains changes."
+              echo "Showing 'git status' and 'git diff' for debugging now:"
+              git status
+              git diff
+              exit 1
+            fi