commit 78ab93d70e73cf37550f45d6fb8fd61825bc1e95 Author: Nicolas Vigier boklm@torproject.org Date: Wed May 9 10:29:18 2018 +0200

Bug 26057: make it easy to see commit used in nightly builds

In order to make it easy to see which commit was used, we include the abbreviated commit hash in the filename of all components that are based on master in the nightly build. To do that, we set git_hash to master, and version (which is included in the filename) to '[% c("abbrev") %]". --- projects/obfs4/config | 1 + projects/sandbox/config | 1 + projects/tor-launcher/config | 3 ++- projects/tor/config | 2 +- projects/torbutton/config | 3 ++- 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/projects/obfs4/config b/projects/obfs4/config index 916887f..2bae851 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -13,6 +13,7 @@ var: targets: nightly: git_hash: master + version: '[% c("abbrev") %]' tag_gpg_id: 0

input_files: diff --git a/projects/sandbox/config b/projects/sandbox/config index a7ed768..11fe6be 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -21,6 +21,7 @@ var: targets: nightly: git_hash: master + version: '[% c("abbrev") %]' tag_gpg_id: 0

input_files: diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index e72ce10..fe21a49 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -13,5 +13,6 @@ input_files:

targets: nightly: - version: master + version: '[% c("abbrev") %]' + git_hash: master tag_gpg_id: 0 diff --git a/projects/tor/config b/projects/tor/config index 78d834f..6219ea6 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -18,7 +18,7 @@ var:

targets: nightly: - version: master + version: '[% c("abbrev") %]' git_hash: master tag_gpg_id: 0

diff --git a/projects/torbutton/config b/projects/torbutton/config index 93bef30..f153cf6 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -13,5 +13,6 @@ input_files:

targets: nightly: - version: master + version: '[% c("abbrev") %]' + git_hash: master tag_gpg_id: 0