From 4cf00a635ed4a31ecf9d9b8607cd1cdece5c1774 Mon Sep 17 00:00:00 2001
From: ruffsl <roxfoxpox@gmail.com>
Date: Tue, 30 Jul 2019 23:50:33 -0700
Subject: [PATCH] Account for failed underlay builds if we don't happen to
 clean the underlay when we keep the underlay from the docker image

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e958dda8aab..9b972d5361e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,7 +61,7 @@ references:
       name: Build Underlay
       command: |
         cd $ROS_WS
-        if [ -d install ]
+        if [ -d install ] && [ ! -f build_failed ]
         then
             echo "Skipping Underlay Build"
         else
@@ -72,6 +72,7 @@ references:
                 -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
                 -DCMAKE_C_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+            rm -f build_failed
         fi
   save_underlay_cache: &save_underlay_cache
     save_cache: