From 89c3b3d5a7d7ea2f97adf67b1ba70f4bf33e1606 Mon Sep 17 00:00:00 2001
From: Elisabeth Kulzer <elikul@elikul.de>
Date: Thu, 25 Jun 2020 14:03:19 +0200
Subject: [PATCH] Fix webapp checkout part 2 (#14910)

* Fix webapp checkout part 2

* Use trap instead to not trigger fail commands before.

* Rm trap afterwards.
---
 .circleci/config.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2f1aa76878..d5a1af404d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,13 +28,10 @@ jobs:
           export WEBAPP_GIT_COMMIT=$(git rev-parse HEAD)
           echo "$WEBAPP_GIT_COMMIT"
 
+          trap 'npm ci && make build' ERR
           curl -f -o ./dist.tar.gz https://pr-builds.mattermost.com/mattermost-webapp/commit/${WEBAPP_GIT_COMMIT}/mattermost-webapp.tar.gz
-          if [[ $? == 0 ]]
-          then
-            mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1
-          else
-            npm ci && make build
-          fi
+          mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1
+          trap - ERR
       - persist_to_workspace:
           root: ~/mattermost
           paths: