From a91d66c755a6fa3cd36deb5035c67709b353aa7b Mon Sep 17 00:00:00 2001
From: Juho Nurminen <juho.nurminen@mattermost.com>
Date: Tue, 8 Sep 2020 12:55:46 +0300
Subject: [PATCH] Clean caches on depcheck failure (#4770)

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fafcd8c77..8a34c7270 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -268,7 +268,12 @@ jobs:
             - owasp/restore_owasp_cache
             - run:
                 name: Update OWASP Dependency-Check Database
-                command: ~/.owasp/dependency-check/bin/dependency-check.sh --data << parameters.cve_data_directory >> --updateonly
+                command: |
+                  if ! ~/.owasp/dependency-check/bin/dependency-check.sh --data << parameters.cve_data_directory >> --updateonly; then
+                    # Update failed, probably due to a bad DB version; delete cached DB and try again
+                    rm -rv ~/.owasp/dependency-check-data/*.db
+                    ~/.owasp/dependency-check/bin/dependency-check.sh --data << parameters.cve_data_directory >> --updateonly
+                  fi
             - owasp/store_owasp_cache:
                 cve_data_directory: <<parameters.cve_data_directory>>
             - run: