aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-06-03 14:49:03 -0400
committerNick Mathewson <nickm@torproject.org>2020-06-03 14:49:03 -0400
commit82d8304efa92cb55647eb0c6b87b90b9eaf103e0 (patch)
treeed814a2cf2237d62a9df10f88012847edcbe2323 /.travis.yml
parent768ffb8f43575baac0970659b01e0a484d6bd6de (diff)
parentf49f1d6fb28d338e0e371ee915a72b85251d239d (diff)
downloadtor-82d8304efa92cb55647eb0c6b87b90b9eaf103e0.tar.gz
tor-82d8304efa92cb55647eb0c6b87b90b9eaf103e0.zip
Merge branch 'ticket34220_035' into ticket34220_041
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 36e9bef4b0..987e56cc7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -193,10 +193,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