diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-05-14 10:20:08 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-05-14 10:20:08 -0400 |
commit | ee6409ab63b1810cb152b09b7b490808ce6d4e6b (patch) | |
tree | 8257887824a320b3bc12f632324c8bc039e42bb5 | |
parent | b444096be5ac509be1b2b68dc8e18ca1f558fef5 (diff) | |
parent | b8bff426f311a5b6cf345e985936b3efd693bfce (diff) | |
download | tor-ee6409ab63b1810cb152b09b7b490808ce6d4e6b.tar.gz tor-ee6409ab63b1810cb152b09b7b490808ce6d4e6b.zip |
Merge branch 'maint-0.4.2' into maint-0.4.3
-rw-r--r-- | .travis.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 5e99b04cfb..703a63a576 100644 --- a/.travis.yml +++ b/.travis.yml @@ -206,7 +206,10 @@ 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. - - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; fi + ## 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 ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi |