Update build branches script
This commit is contained in:
parent
f7d6327d5d
commit
061db5339b
1 changed files with 7 additions and 8 deletions
|
@ -30,8 +30,7 @@ do
|
||||||
git checkout .
|
git checkout .
|
||||||
git reset HEAD --hard
|
git reset HEAD --hard
|
||||||
git checkout $BRANCH
|
git checkout $BRANCH
|
||||||
git merge $GIT_ORIGIN_NAME/$BRANCH
|
git reset $GIT_ORIGIN_NAME/$BRANCH --hard
|
||||||
|
|
||||||
sed -e "s/\(APP_DESCRIPTION.*=.*\"\).*\(\".*\)/\1$SHORT_DATE $BRANCH\2/g" $VERSION_FILE > ${VERSION_FILE}.bak
|
sed -e "s/\(APP_DESCRIPTION.*=.*\"\).*\(\".*\)/\1$SHORT_DATE $BRANCH\2/g" $VERSION_FILE > ${VERSION_FILE}.bak
|
||||||
mv ${VERSION_FILE}.bak ${VERSION_FILE}
|
mv ${VERSION_FILE}.bak ${VERSION_FILE}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue