mirror of https://gitee.com/bigwinds/arangodb
allow empty commits and make shure the enterprise directory is managed properly.
This commit is contained in:
parent
886ed6492d
commit
3f6eff9baf
|
@ -3,7 +3,7 @@ set -ex
|
|||
|
||||
SCRIPT_DIR=`dirname $0`
|
||||
SRC_DIR="${SCRIPT_DIR}/../"
|
||||
ENTERPRISE_SRC_DIR=${SRC_DIR}/enterprise
|
||||
ENTERPRISE_SRC_DIR=${SRC_DIR}enterprise
|
||||
|
||||
FORCE_TAG=0
|
||||
TAG=1
|
||||
|
@ -113,7 +113,7 @@ else
|
|||
fi
|
||||
echo "I'm on Branch: ${GITARGS}"
|
||||
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
|
||||
|
||||
cd ${ENTERPRISE_SRC_DIR}
|
||||
git commit -m "release version $VERSION enterprise" -a
|
||||
git commit --allow-empty -m "release version $VERSION enterprise" -a
|
||||
git push
|
||||
|
||||
if test "${FORCE_TAG}" == 0; then
|
||||
|
|
Loading…
Reference in New Issue