Commit b99c47a5 authored by Grand Francois's avatar Grand Francois
Browse files

fix(ci): deploy-new-stable-version.sh: do not consider untracked files in git status

parent b412ecac
Pipeline #36047 canceled with stages
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment