From b99c47a592672f03a92133dd53b06044c13c7c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Tue, 10 May 2022 13:23:22 +0200
Subject: [PATCH] fix(ci): deploy-new-stable-version.sh: do not consider
untracked files in git status
---
scripts/deploy-new-stable-version.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/scripts/deploy-new-stable-version.sh b/scripts/deploy-new-stable-version.sh
index f911aaea0..56b69f872 100755
--- a/scripts/deploy-new-stable-version.sh
+++ b/scripts/deploy-new-stable-version.sh
@@ -38,7 +38,7 @@ git checkout master
git pull --rebase
npm install
npm run jasmine
-if [ ! -z "$(git status --porcelain)" ]
+if [ ! -z "$(git status --untracked-files=no --porcelain)" ]
then
echo "commiting changes induced by 'npm install'"
git commit -a -m "verify dependencies (npm install) before deploying version $VERSION"
@@ -46,13 +46,14 @@ fi
# 1.3 version in package.*
npm version "$VERSION" --allow-same-version --git-tag-version=false
-if [ ! -z "$(git status --porcelain)" ]
+if [ ! -z "$(git status --untracked-files=no --porcelain)" ]
then
echo "commiting changes induced by 'npm version'"
git commit -a -m "update package.* to version $VERSION"
fi
# 1.4 tags
+echo "setting tags to $VERSION version"
git tag -fa "nghyd_$VERSION" -m "release version $VERSION"
sleep 1
git tag -fa stable -m "stable version"
@@ -71,7 +72,7 @@ cd ../nghyd
git checkout master
git pull --rebase
npm install
-if [ ! -z "$(git status --porcelain)" ]
+if [ ! -z "$(git status --untracked-files=no --porcelain)" ]
then
echo "commiting changes induced by 'npm install'"
git commit -a -m "verify dependencies (npm install) before deploying version $VERSION"
@@ -79,13 +80,14 @@ fi
# 2.3 version in package.*
npm version "$VERSION" --allow-same-version --git-tag-version=false
-if [ ! -z "$(git status --porcelain)" ]
+if [ ! -z "$(git status --untracked-files=no --porcelain)" ]
then
echo "commiting changes induced by 'npm version'"
git commit -a -m "update package.* to version $VERSION"
fi
# 2.4 tags
+echo "setting tags to $VERSION version"
git tag -fa stable -m "stable version"
sleep 1
git tag -fa "$VERSION" -m "release version $VERSION"
--
GitLab