commit d5084d8a23fc30233a3522b697deead0fedf73b9
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Fri Oct 10 18:10:15 2014 -0700
Revert "Also switch gitian to commit hash."
This reverts commit 4d5787fb137e5275c5c23588caa1956770f3c67e.
---
gitian/mkbundle-linux.sh | 2 +-
gitian/mkbundle-mac.sh | 2 +-
gitian/mkbundle-windows.sh | 2 +-
gitian/record-inputs.sh | 2 +-
gitian/verify-tags.sh | 2 +-
gitian/versions.alpha | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index 68d53a1..8321ffe 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -83,7 +83,7 @@ then
# If we're verifying tags, be explicit to gitian that we
# want to build from tags.
NSIS_TAG=refs/tags/$NSIS_TAG
- #GITIAN_TAG=refs/tags/$GITIAN_TAG
+ GITIAN_TAG=refs/tags/$GITIAN_TAG
TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG
TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG
TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 2239d75..9c5d99b 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -88,7 +88,7 @@ then
# If we're verifying tags, be explicit to gitian that we
# want to build from tags.
NSIS_TAG=refs/tags/$NSIS_TAG
- #GITIAN_TAG=refs/tags/$GITIAN_TAG
+ GITIAN_TAG=refs/tags/$GITIAN_TAG
TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG
TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG
TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG
diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
index b140202..7600e07 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -81,7 +81,7 @@ then
# If we're verifying tags, be explicit to gitian that we
# want to build from tags.
NSIS_TAG=refs/tags/$NSIS_TAG
- #GITIAN_TAG=refs/tags/$GITIAN_TAG
+ GITIAN_TAG=refs/tags/$GITIAN_TAG
TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG
TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG
TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG
diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh
index eb368a9..afcd70d 100755
--- a/gitian/record-inputs.sh
+++ b/gitian/record-inputs.sh
@@ -35,7 +35,7 @@ then
# If we're verifying tags, be explicit to gitian that we
# want to build from tags.
NSIS_TAG=refs/tags/$NSIS_TAG
- #GITIAN_TAG=refs/tags/$GITIAN_TAG
+ GITIAN_TAG=refs/tags/$GITIAN_TAG
TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG
TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG
TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index b359496..a4f6ca1 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -147,6 +147,6 @@ done
cd "$INPUTS_DIR"
-#verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG"
+verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG"
git checkout "$GITIAN_TAG"
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 5d7b8a2..a9df723 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -27,7 +27,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0
GOPTLIB_TAG=0.2
MEEK_TAG=0.11
-GITIAN_TAG=ae72871ea2e1c731ee34bba27a47fcce1b79786e #tor-browser-builder-3.x-6
+GITIAN_TAG=tor-browser-builder-3.x-6
OPENSSL_VER=1.0.1i
GMP_VER=5.1.3