From b05a6b27d5785e24cf46ff530806c72d78498d5a Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Tue, 28 Nov 2023 13:49:39 +0100
Subject: [PATCH] chore: Possibly fix failing if

---
 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac4dce5..1bc7ae9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,11 +63,12 @@ deploy-to-staging:
     - ssh $SERVER_USER@$SERVER_IP "mkdir -p $TMP_PATH"
     - echo "Archive currently deployed application"
     - CURRENT_VERSION=$(ssh $SERVER_USER@$SERVER_IP "ls $DEPLOYMENT_PATH/VIPSCore-*.war | head -n 1 | sed -n 's/.*VIPSCore-\(.*\)\.war/\1/p'")
-    - if [ -n "$CURRENT_VERSION" ]; then
-      TIMESTAMP=$(date +'%Y%m%d%H%M%S')
-      ssh $SERVER_USER@$SERVER_IP "mv $DEPLOYMENT_PATH/VIPSCore-${CURRENT_VERSION}.war $ARCHIVE_PATH/VIPSCore-${CURRENT_VERSION}-${TIMESTAMP}.war"
+    - |
+      if [ -n "$CURRENT_VERSION" ]; then
+        TIMESTAMP=$(date +'%Y%m%d%H%M%S')
+        ssh $SERVER_USER@$SERVER_IP "mv $DEPLOYMENT_PATH/VIPSCore-${CURRENT_VERSION}.war $ARCHIVE_PATH/VIPSCore-${CURRENT_VERSION}-${TIMESTAMP}.war"
       else
-      echo "No matching file found. Skipping archive step."
+        echo "No matching file found. Skipping archive step."
       fi
     - echo "Deploy $WAR_FILE using JBoss CLI"
     - scp $WAR_FILE $SERVER_USER@$SERVER_IP:$TMP_PATH
-- 
GitLab