[tor-commits] [tor-browser-bundle/maint-3.6] Also switch gitian to commit hash.

[mikeperry at torproject.org]

commit 54b54404bebf330a2addd7fc77730326fe6de756
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Sep 24 02:26:42 2014 -0700

    Also switch gitian to commit hash.
---
 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            |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index ea6d171..cdaf51d 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 e852989..3cd137b 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -90,7 +90,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 ecabeae..e582d17 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -85,7 +85,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 7531589..29f1e34 100755
--- a/gitian/record-inputs.sh
+++ b/gitian/record-inputs.sh
@@ -36,7 +36,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 8aa818e..36269f3 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -144,6 +144,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 b/gitian/versions
index 7c38d91..a52facf 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2
 
-GITIAN_TAG=tor-browser-builder-3.x-6
+GITIAN_TAG=ae72871ea2e1c731ee34bba27a47fcce1b79786e #tor-browser-builder-3.x-6
 
 OPENSSL_VER=1.0.1i
 GMP_VER=5.1.3