diff options
author | David Goulet <dgoulet@torproject.org> | 2020-06-12 12:55:41 -0400 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2020-06-12 12:55:41 -0400 |
commit | 75734f48aabb955ed39c42dfd37849a7fa3df423 (patch) | |
tree | 30573fe2194d90317d590b48d4226d984ae1f893 | |
parent | 52edea121e34dbbecc009a9f18fbc508db247ebe (diff) | |
parent | 272c171136f4ed7660ef409f75ce7bac29a004f3 (diff) | |
download | tor-75734f48aabb955ed39c42dfd37849a7fa3df423.tar.gz tor-75734f48aabb955ed39c42dfd37849a7fa3df423.zip |
Merge branch 'maint-0.4.3' into maint-0.4.4
-rw-r--r-- | .travis.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index cbbff2d942..01343e65d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -210,10 +210,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 |