summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-06-12 12:55:41 -0400
committerDavid Goulet <dgoulet@torproject.org>2020-06-12 12:55:41 -0400
commit0f218a05a6d8271639a81ec2667f86ef1aa38e66 (patch)
tree8aa8818c9258a9e1e8728cdee3eefb5e9055e843
parent1930828957c9caeeeec165c9068f5898d092f268 (diff)
parent6a43aadecc5ab8564e71da2f00483eb63df13ae0 (diff)
downloadtor-0f218a05a6d8271639a81ec2667f86ef1aa38e66.tar.gz
tor-0f218a05a6d8271639a81ec2667f86ef1aa38e66.zip
Merge branch 'maint-0.3.5' into maint-0.4.2
-rw-r--r--.travis.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index ae7b93ed91..3a160840a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -195,10 +195,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