From 0aa0d2c38c0d4e89d06b16c184d6d6fd909fd728 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Mon, 4 Jul 2022 10:12:01 +0000
Subject: [PATCH] fix: correct definition of the base folder for prod and dev
versions
Refs #540
---
.gitlab-ci.yml | 5 ++---
scripts/deploy-version.sh | 14 +++++---------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaf15f2ff..a5c0769fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,8 +118,7 @@ deploy-dev:
- build
script:
# Copie de la branche / du tag
- - if [[ $CI_COMMIT_REF_NAME != "stable" ]]; then ./scripts/deploy-version.sh $CI_COMMIT_REF_NAME $DEV_LOGIN $DEV_HOST $DEV_PATH; fi
- - if [[ $CI_COMMIT_REF_NAME == "stable" ]]; then ./scripts/deploy-version.sh $CI_COMMIT_REF_NAME $DEV_LOGIN $DEV_HOST $DEV_PATH/stable 0; fi
+ - ./scripts/deploy-version.sh $CI_COMMIT_REF_NAME $DEV_LOGIN $DEV_HOST $DEV_PATH
deploy-prod:
stage: deploy-prod
@@ -129,7 +128,7 @@ deploy-prod:
dependencies:
- build
script:
- - ./scripts/deploy-version.sh stable $PROD_LOGIN $PROD_HOST $PROD_PATH 1 $PROD_PASS
+ - ./scripts/deploy-version.sh prod $PROD_LOGIN $PROD_HOST $PROD_PATH $PROD_PASS
releases-nightly:
stage: releases-nightly
diff --git a/scripts/deploy-version.sh b/scripts/deploy-version.sh
index d4cfb8814..c495e81e0 100755
--- a/scripts/deploy-version.sh
+++ b/scripts/deploy-version.sh
@@ -14,20 +14,16 @@ VERSION="$1"
LOGIN="$2"
HOST="$3"
DIR="$4"
-UPDATE_INDEX=$5
-PASS="$6"
+PASS="$5"
echo "$(basename $0): deploying version $VERSION in $LOGIN@$HOST:$DIR"
-if [[ $VERSION == "stable" ]]; then
+if [[ $VERSION == "prod" ]]; then
# Copie de la branche production
rsync -a --delete --exclude=cassiopee-releases -e "ssh -o StrictHostKeyChecking=no" dist/ ${LOGIN}@${HOST}:${DIR}/
-
- if (( $UPDATE_INDEX == 1 )); then
- # Modification du dossier base href
- echo "updating index.html"
- ssh $LOGIN@$HOST "sed -i 's:/cassiopee/stable/:/:g' $DIR/index.html"
- fi
+ # Modification du dossier base href
+ echo "updating index.html"
+ ssh $LOGIN@$HOST "sed -i 's:/cassiopee/stable/:/:g' $DIR/index.html"
else
# Copie de la branche / du tag
rsync -a --delete --exclude=cassiopee-releases -e "ssh -o StrictHostKeyChecking=no" "dist/" "$LOGIN@$HOST:$DIR/$VERSION"
--
GitLab