summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-06-12 12:55:17 -0400
committerDavid Goulet <dgoulet@torproject.org>2020-06-12 12:55:17 -0400
commit6a43aadecc5ab8564e71da2f00483eb63df13ae0 (patch)
tree61ac2e07b6d6cf69647cfac5776f267e829f74df
parentc1add51bcc49c299391e662603b590699031496c (diff)
parentf49f1d6fb28d338e0e371ee915a72b85251d239d (diff)
downloadtor-6a43aadecc5ab8564e71da2f00483eb63df13ae0.tar.gz
tor-6a43aadecc5ab8564e71da2f00483eb63df13ae0.zip
Merge branch 'tor-github/pr/1912' into maint-0.3.5
-rw-r--r--.travis.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 852bebfa0f..8bc9898f8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -191,10 +191,7 @@ install:
## If we're running chutney, install it.
- if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi
## If we're running stem, install it.
- ## XXXX We are temporarily fixing the version at d1174a83 to work around
- ## https://github.com/torproject/stem/issues/63 .
- ## - if [[ "$TEST_STEM" != "" ]]; then git clone --no-tags --depth 1 https://github.com/torproject/stem.git; export STEM_SOURCE_DIR=`pwd`/stem; fi
- - if [[ "$TEST_STEM" != "" ]]; then git clone https://github.com/torproject/stem.git && ( cd ./stem && git checkout d1174a83c2dcb7b855d8fc986be3ab8f8d88d68c) ; export STEM_SOURCE_DIR=`pwd`/stem; fi
+ - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; fi
##
## Finally, list installed package versions
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi