Skip to content

Commit

Permalink
Auto merge of zcash#2162 - arcalinea:release_process_1.0.7-1, r=str4d
Browse files Browse the repository at this point in the history
Release process 1.0.7 1
  • Loading branch information
zkbot committed Mar 9, 2017
2 parents f5fbf40 + 0195a9f commit 00740e0
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Zcash 1.0.7
===========
Zcash 1.0.7-1
=============

What is Zcash?
--------------
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 7)
define(_CLIENT_VERSION_BUILD, 50)
define(_CLIENT_VERSION_BUILD, 51)
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
define(_CLIENT_VERSION_IS_RELEASE, true)
Expand Down
8 changes: 7 additions & 1 deletion contrib/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
zcash (1.0.7+1) jessie; urgency=medium

* 1.0.7-1 release.

-- Zcash Company <[email protected]> Wed, 08 Mar 2017 13:51:11 -0800

zcash (1.0.7) jessie; urgency=medium

* 1.0.7 release.
* 1.0.7 release.

-- Zcash Company <[email protected]> Fri, 03 Mar 2017 20:55:04 -0800

Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "zcash-1.0.7"
name: "zcash-1.0.7-1"
enable_cache: true
distro: "debian"
suites:
Expand Down
2 changes: 1 addition & 1 deletion doc/authors.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Sean Bowe (183)
Taylor Hornby (65)
Daira Hopwood (65)
Jonas Schnelli (47)
Jay Graber (39)
Jay Graber (42)
Kevin Gallagher (38)
Wladimir J. van der Laan (30)
Cory Fields (13)
Expand Down
2 changes: 1 addition & 1 deletion doc/man/zcash-cli.1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.SH NAME
zcash-cli \- manual page for zcash-cli v1.0.7
.SH DESCRIPTION
Zcash RPC client version v1.0.7
Zcash RPC client version v1.0.7-1
.SS "Usage:"
.TP
zcash\-cli [options] <command> [params]
Expand Down
2 changes: 1 addition & 1 deletion doc/man/zcash-tx.1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.SH NAME
zcash-tx \- manual page for zcash-tx v1.0.7
.SH DESCRIPTION
Zcash zcash\-tx utility version v1.0.7
Zcash zcash\-tx utility version v1.0.7-1
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]
Expand Down
2 changes: 1 addition & 1 deletion doc/man/zcashd.1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.SH NAME
zcashd \- manual page for zcashd v1.0.7
.SH DESCRIPTION
Zcash Daemon version v1.0.7
Zcash Daemon version v1.0.7-1
.SS "Usage:"
.TP
zcashd [options]
Expand Down
4 changes: 4 additions & 0 deletions doc/release-notes/release-notes-1.0.7-1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Jay Graber (3):
Add -t to git fetch for release-notes.py
Update version to 1.0.7-1
Update auto-generated manpages to 1.0.7-1
2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 7
#define CLIENT_VERSION_BUILD 50
#define CLIENT_VERSION_BUILD 51

//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
2 changes: 1 addition & 1 deletion zcutil/release-notes.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def document_authors():
def generate_release_note(version, filename):
print "Automatically generating release notes for {0} from git shortlog. Should review {1} for accuracy.".format(version, filename)
# fetches latest tags, so that latest_tag will be correct
subprocess.Popen(['git fetch'], shell=True, stdout=subprocess.PIPE).communicate()[0]
subprocess.Popen(['git fetch -t'], shell=True, stdout=subprocess.PIPE).communicate()[0]
latest_tag = subprocess.Popen(['git describe --abbrev=0'], shell=True, stdout=subprocess.PIPE).communicate()[0].strip()
print "Previous release tag: ", latest_tag
notes = subprocess.Popen(['git shortlog --no-merges {0}..HEAD'.format(latest_tag)], shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE).communicate()[0]
Expand Down

0 comments on commit 00740e0

Please sign in to comment.