Release 3.6.0

Guake · Apr 26, 2019 · 6fe109c · 6fe109c
1 parent 6ad8ae8
commit 6fe109c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -433,7 +433,7 @@ release-note-github: reno-lint
 			sed 's/\\\#/\#/g' | \
 		tr '\r' '\n'
 
-release: git-pull-rebase tag-pbr release-note-news rm-dists update-po dists release-git-tag release-note-github git-commit-amend
+release: git-pull-rebase tag-pbr git-commit-release-commit release-note-news rm-dists update-po dists release-git-tag release-note-github git-commit-amend
 
 git-pull-rebase:
 	git checkout -f master
@@ -442,15 +442,19 @@ git-pull-rebase:
 release-git-tag:
 	@{ \
 		set -x \
-		git commit --all -m "Release $$(pipenv run python setup.py --version | cut -d. -f1,2,3)"; \
-		PROJECTNAME=$$(pipenv run python setup.py --name); \
 		git tag -d "$$(pipenv run python setup.py --version | cut -d. -f1,2,3)"; \
+		git commit --all -m "Release ???"; \
+		PROJECTNAME=$$(pipenv run python setup.py --name); \
 		echo "Note: tag has been removed. Use 'make tag-pbr' to tag and push to origin"; \
 	}
 
 git-commit-amend:
 	git commit -a --amend
 
+git-commit-release-commit:
+	git commit --all -m "Release $$(pipenv run python setup.py --version | cut -d. -f1,2,3)"
+
+
 # aliases to gracefully handle typos on poor dev's terminal
 check: checks
 devel: dev

diff --git a/NEWS.rst b/NEWS.rst
@@ -2,8 +2,8 @@
 Guake
 =====
 
-(unreleased yet)
-================
+3.6.0
+=====
 
 Release Summary
 ---------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,8 @@ @@
     Guake
     =====
-    (unreleased yet)
-    ================
+.6.0
+    =====
     Release Summary
     ---------------
@@ Expand Down @@