Make release process get the tag from maint into master
This commit is contained in:
parent
1f6a1c0cba
commit
c3740a936b
1
Makefile
1
Makefile
|
@ -297,6 +297,7 @@ release:
|
||||||
make pushreleasetag TAG=$(TAG)
|
make pushreleasetag TAG=$(TAG)
|
||||||
git push origin maint
|
git push origin maint
|
||||||
git checkout master
|
git checkout master
|
||||||
|
git merge -s ours maint
|
||||||
UTILITIES/set-version.pl -o $(TAG)
|
UTILITIES/set-version.pl -o $(TAG)
|
||||||
git commit -a -m "Update website to show $(TAG) as current release"
|
git commit -a -m "Update website to show $(TAG) as current release"
|
||||||
git push
|
git push
|
||||||
|
|
Loading…
Reference in New Issue