Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

allow empty commits and make shure the enterprise directory is managed properly.

This commit is contained in:
Wilfried Goesgens 2016-12-07 15:16:21 +01:00
parent 886ed6492d
commit 3f6eff9baf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Installation/release.sh
View File

@ -3,7 +3,7 @@ set -ex
SCRIPT_DIR=`dirname $0` SCRIPT_DIR=`dirname $0`
SRC_DIR="${SCRIPT_DIR}/../" SRC_DIR="${SCRIPT_DIR}/../"
ENTERPRISE_SRC_DIR=${SRC_DIR}/enterprise ENTERPRISE_SRC_DIR=${SRC_DIR}enterprise
FORCE_TAG=0 FORCE_TAG=0
TAG=1 TAG=1
@ -113,7 +113,7 @@ else
fi fi
echo "I'm on Branch: ${GITARGS}" echo "I'm on Branch: ${GITARGS}"
fi fi
(cd enterprise; git checkout master; git fetch --tags; git pull --all; git checkout ${GITARGS} ) (cd enterprise; git checkout master; git fetch --tags; git pull --all; git checkout ${GITARGS}; git pull )
@ -220,7 +220,7 @@ if [ "$TAG" == "1" ]; then
fi fi
cd ${ENTERPRISE_SRC_DIR} cd ${ENTERPRISE_SRC_DIR}
git commit -m "release version $VERSION enterprise" -a git commit --allow-empty -m "release version $VERSION enterprise" -a
git push git push
if test "${FORCE_TAG}" == 0; then if test "${FORCE_TAG}" == 0; then