yetangitu/photo-wordpress
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'development'

Browse source
This commit is contained in:
Randy Hoyt 2013-01-12 15:49:50 +00:00
commit 2cb0713dc6
1 changed files with 2 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

27
deploy.sh
View file

@ -32,35 +32,12 @@ git add ${GITPATH}/${MAINFILE}
git commit -m "Tagging version $NEWVERSION"
git tag -a "$NEWVERSION" -m "Tagging version $NEWVERSION"
git checkout master
git merge dev
git merge development
git add *
git commit -m "Merging version $NEWVERSION to master"
git push
git push --tags
git checkout dev
<<<<<<< HEAD
NEWVERSION=`grep "^Stable tag:" $GITPATH/readme.txt | awk -F' ' '{print $NF}'`
<<<<<<< HEAD
<<<<<<< HEAD
sed -c -i 's/Stable tag: '$NEWVERSION'/Stable tag: 'VERSION_NUMBER/g' ${GITPATH}/readme.txt
NEWVERSION=`grep "^Version:" $GITPATH/$MAINFILE | awk -F' ' '{print $NF}'`
sed -c -i 's/Version: '$NEWVERSION'/Version: 'VERSION_NUMBER/g' ${GITPATH}/${MAINFILE}
=======
sed -c -i 's/Stable tag: '$NEWVERSION'/Stable tag: %VERSION_NUMBER%/g' ${GITPATH}/readme.txt
NEWVERSION=`grep "^Version:" $GITPATH/$MAINFILE | awk -F' ' '{print $NF}'`
sed -c -i 's/Version: '$NEWVERSION'/Version: %VERSION_NUMBER%/g' ${GITPATH}/${MAINFILE}
>>>>>>> dev
=======
sed -c -i 's/Stable tag: '$NEWVERSION'/Stable tag: VERSION_NUMBER/g' ${GITPATH}/readme.txt
NEWVERSION=`grep "^Version:" $GITPATH/$MAINFILE | awk -F' ' '{print $NF}'`
sed -c -i 's/Version: '$NEWVERSION'/Version: VERSION_NUMBER/g' ${GITPATH}/${MAINFILE}
>>>>>>> dev
git add readme.txt
git add ${GITPATH}/${MAINFILE}
git commit -m "Tagging version $NEWVERSION"
git push
=======
>>>>>>> dev
git checkout development
# Set up Subversion repository configuration.
SVNFOLDER='svn/'$SVNSLUG