From c271b6b76f63d6b93a42a5b1f3473c10ab9ec2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Tue, 17 May 2022 15:52:25 +0200
Subject: [PATCH] fix(ci): do not update index.html href in case of deployment
of a stable version on aubes
refs #540
---
.gitlab-ci.yml | 4 ++--
scripts/deploy-version.sh | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54d4e6d12..901ed8f2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,7 +119,7 @@ deploy-dev:
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; 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
deploy-prod:
stage: deploy-prod
@@ -129,7 +129,7 @@ deploy-prod:
dependencies:
- build
script:
- - ./scripts/deploy-version.sh stable $PROD_LOGIN $PROD_HOST $PROD_PATH $PROD_PASS
+ - ./scripts/deploy-version.sh stable $PROD_LOGIN $PROD_HOST $PROD_PATH 1 $PROD_PASS
releases-nightly:
stage: releases-nightly
diff --git a/scripts/deploy-version.sh b/scripts/deploy-version.sh
index 59ed40937..d4cfb8814 100755
--- a/scripts/deploy-version.sh
+++ b/scripts/deploy-version.sh
@@ -14,7 +14,8 @@ VERSION="$1"
LOGIN="$2"
HOST="$3"
DIR="$4"
-PASS="$5"
+UPDATE_INDEX=$5
+PASS="$6"
echo "$(basename $0): deploying version $VERSION in $LOGIN@$HOST:$DIR"
@@ -22,9 +23,11 @@ if [[ $VERSION == "stable" ]]; then
# Copie de la branche production
rsync -a --delete --exclude=cassiopee-releases -e "ssh -o StrictHostKeyChecking=no" dist/ ${LOGIN}@${HOST}:${DIR}/
- # Modification du dossier base href
- echo "updating index.html"
- ssh $LOGIN@$HOST "sed -i 's:/cassiopee/stable/:/:g' $DIR/index.html"
+ 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
else
# Copie de la branche / du tag
rsync -a --delete --exclude=cassiopee-releases -e "ssh -o StrictHostKeyChecking=no" "dist/" "$LOGIN@$HOST:$DIR/$VERSION"
--
GitLab