未验证 提交 bac50132 编写于 作者: R Rongfeng Fu 提交者: GitHub

reset version && build.sh fix (#78)

上级 9dbb6b71
...@@ -104,7 +104,7 @@ function build() ...@@ -104,7 +104,7 @@ function build()
cd2workdir cd2workdir
DIR=`pwd` DIR=`pwd`
cd .. cd ..
VERSION=`grep 'Version:' ob-deploy.spec | head -n1 | awk -F' ' '{print $2}'` VERSION=`grep 'Version:' rpm/ob-deploy.spec | head -n1 | awk -F' ' '{print $2}'`
CID=`git log |head -n1 | awk -F' ' '{print $2}'` CID=`git log |head -n1 | awk -F' ' '{print $2}'`
BRANCH=`git branch | grep -e "^\*" | awk -F' ' '{print $2}'` BRANCH=`git branch | grep -e "^\*" | awk -F' ' '{print $2}'`
DATE=`date '+%b %d %Y %H:%M:%S'` DATE=`date '+%b %d %Y %H:%M:%S'`
...@@ -115,9 +115,9 @@ function build() ...@@ -115,9 +115,9 @@ function build()
mkdir -p $BUILD_DIR/mirror/remote mkdir -p $BUILD_DIR/mirror/remote
wget https://mirrors.aliyun.com/oceanbase/OceanBase.repo -O $BUILD_DIR/mirror/remote/OceanBase.repo wget https://mirrors.aliyun.com/oceanbase/OceanBase.repo -O $BUILD_DIR/mirror/remote/OceanBase.repo
cat _cmd.py | sed "s/<CID>/$CID/" | sed "s/<B_BRANCH>/$BRANCH/" | sed "s/<B_TIME>/$DATE/" | sed "s/<DEBUG>/$OBD_DUBUG/" | sed "s/<VERSION>/$VERSION/" > obd.py cat _cmd.py | sed "s/<CID>/$CID/" | sed "s/<B_BRANCH>/$BRANCH/" | sed "s/<B_TIME>/$DATE/" | sed "s/<DEBUG>/$OBD_DUBUG/" | sed "s/<VERSION>/$VERSION/" > obd.py
pip install -r $req_fn.txt | exit 1 pip install -r $req_fn.txt || exit 1
pip install -r plugins-$req_fn.txt --target=$BUILD_DIR/lib/site-packages | exit 1 pip install -r plugins-$req_fn.txt --target=$BUILD_DIR/lib/site-packages || exit 1
pyinstaller --hidden-import=decimal --hidden-import=configparser -F obd.py | exit 1 pyinstaller --hidden-import=decimal --hidden-import=configparser -F obd.py || exit 1
rm -f obd.py obd.spec rm -f obd.py obd.spec
cp -r plugins $BUILD_DIR/plugins cp -r plugins $BUILD_DIR/plugins
rm -fr /usr/obd /usr/bin/obd rm -fr /usr/obd /usr/bin/obd
......
Name: ob-deploy Name: ob-deploy
Version: 1.2.1 Version: 1.2.0
Release: %(echo $RELEASE)%{?dist} Release: %(echo $RELEASE)%{?dist}
# if you want use the parameter of rpm_create on build time, # if you want use the parameter of rpm_create on build time,
# uncomment below # uncomment below
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册