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 | 2c2c349bdfbb2ac6eb9624607a2153deebdb7426 (patch) | |
tree | 2430bff94cdcb965b85014cff4fa029105cb2f2c | |
parent | 789de7c35baa23ee34c709e15e743aa54a62a479 (diff) | |
parent | e63bfca5f2d98788d11b9a0a82bf67277a228c71 (diff) | |
download | tor-2c2c349bdfbb2ac6eb9624607a2153deebdb7426.tar.gz tor-2c2c349bdfbb2ac6eb9624607a2153deebdb7426.zip |
Merge branch 'maint-0.3.5' into release-0.3.5
-rw-r--r-- | .travis.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 8bc9898f8f..852bebfa0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,7 +191,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 |