From daed890f8c72c4d07d6b232f81be843fff29ee8a Mon Sep 17 00:00:00 2001
From: Alan Bernstein <alan.aaron.bernstein@gmail.com>
Date: Wed, 26 May 2021 11:55:44 -0500
Subject: [PATCH] Avoid early exit in 'bash -eo pipefail' script

---
 .circleci/config.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c9b629052..14c7a3367 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,25 +38,21 @@ commands:
     description: "skips the parent job if the PR includes no changes to pilosa"
     steps:
       - run: |
-          ROOT_CHANGED_FILES="$(git diff --name-only HEAD $(git merge-base master HEAD) | grep -v '^lattice/')"
+          ROOT_CHANGED_FILES="$(git diff --name-only HEAD $(git merge-base master HEAD) | grep -v '^lattice/')" || true
           echo "ROOT_CHANGED_FILES = $ROOT_CHANGED_FILES"
-          if [ -z $ROOT_CHANGED_FILES ] ; then
+          if [ -z "$ROOT_CHANGED_FILES" ] ; then
             echo "halting step"
             circleci step halt
-          else
-            true
           fi
   skip-if-lattice-unchanged:
     description: "skips the parent job if the PR includes no changes to lattice"
     steps:
       - run: |
-          LATTICE_CHANGED_FILES="$(git diff --name-only HEAD $(git merge-base master HEAD) | grep '^lattice/')"
+          LATTICE_CHANGED_FILES="$(git diff --name-only HEAD $(git merge-base master HEAD) | grep '^lattice/')" || true
           echo "LATTICE_CHANGED_FILES = $LATTICE_CHANGED_FILES"
-          if [ -z $LATTICE_CHANGED_FILES ] ; then
+          if [ -z "$LATTICE_CHANGED_FILES" ] ; then
             echo "halting step"
             circleci step halt
-          else
-            true
           fi
 
 jobs: