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 | 272c171136f4ed7660ef409f75ce7bac29a004f3 (patch) | |
| tree | 07bcaa51663e20eae43fd46dac875dfe15600867 | |
| parent | 754d4e9a17b216c8b3bf5f4ded47d0fd6d1634fa (diff) | |
| parent | 0f218a05a6d8271639a81ec2667f86ef1aa38e66 (diff) | |
| download | tor-272c171136f4ed7660ef409f75ce7bac29a004f3.tar.gz tor-272c171136f4ed7660ef409f75ce7bac29a004f3.zip | |
Merge branch 'maint-0.4.2' into maint-0.4.3
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 703a63a576..5e99b04cfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -206,10 +206,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 |