Update bump.sh
This commit is contained in:
parent
49515b3eb8
commit
27dba0e9ae
@ -1,5 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
if [ -z "$1" ]; then
|
if [ -z "$1" ]; then
|
||||||
echo "Usage: $0 VERSION" >&2
|
echo "Usage: $0 VERSION" >&2
|
||||||
exit 1
|
exit 1
|
||||||
@ -19,6 +21,13 @@ sed -i 's/(defconst ghc-version ".*")/(defconst ghc-version "'"$VERSION"'")/' \
|
|||||||
|
|
||||||
sed -r -i 's/^(Version:[[:space:]]*)[0-9.]+/\1'"$VERSION"'/' ghc-mod.cabal
|
sed -r -i 's/^(Version:[[:space:]]*)[0-9.]+/\1'"$VERSION"'/' ghc-mod.cabal
|
||||||
|
|
||||||
|
git add elisp/ghc.el ghc-mod.cabal
|
||||||
|
git commit -m "Bump version to $VERSION"
|
||||||
|
|
||||||
|
git checkout release
|
||||||
|
#git merge master
|
||||||
|
git merge -s recursive -X theirs master
|
||||||
|
|
||||||
( tac ChangeLog; echo "\n$(date '+%Y-%m-%d') v$VERSION" ) | tac \
|
( tac ChangeLog; echo "\n$(date '+%Y-%m-%d') v$VERSION" ) | tac \
|
||||||
> ChangeLog.tmp
|
> ChangeLog.tmp
|
||||||
|
|
||||||
@ -26,6 +35,8 @@ mv ChangeLog.tmp ChangeLog
|
|||||||
|
|
||||||
emacs -q -nw ChangeLog
|
emacs -q -nw ChangeLog
|
||||||
|
|
||||||
git add ChangeLog elisp/ghc.el ghc-mod.cabal
|
git add ChangeLog
|
||||||
git commit -m "Bump version to $VERSION"
|
git commit -m "ChangeLog"
|
||||||
|
|
||||||
|
|
||||||
git tag "v$VERSION"
|
git tag "v$VERSION"
|
||||||
|
Loading…
Reference in New Issue
Block a user