diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54d4e6d1290087f140609006a7af5624b4e05160..901ed8f2ae922c3d19d9d48930ed972812699cbf 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 59ed409376a5780a12818a89111dfa511d714303..d4cfb88144fb7b161a5a19507b3ad31769823974 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"