diff options
| author | rl1987 <rl1987@sdf.lonestar.org> | 2018-10-19 18:30:33 +0300 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-29 15:18:07 -0400 |
| commit | 4fd4e27163c0819a05d10d2d07c6646f32bf9235 (patch) | |
| tree | b4fb344bd6cc642839206f1337167465bef8a297 /.travis.yml | |
| parent | bee9093b556fb0381ef52680e25c94c0c337ace1 (diff) | |
| download | tor-4fd4e27163c0819a05d10d2d07c6646f32bf9235.tar.gz tor-4fd4e27163c0819a05d10d2d07c6646f32bf9235.zip | |
Try putting stem repo cloning into install part of config
Also print stem version when we have it downloaded
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index e0cb88c1ac..b044f98260 100644 --- a/.travis.yml +++ b/.travis.yml @@ -186,6 +186,7 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi ## If we're testing rust builds in offline-mode, then set up our vendored dependencies - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; 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 @@ -197,6 +198,7 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; popd; fi script: - ./autogen.sh @@ -205,7 +207,7 @@ script: - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi - - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; make src/app/tor test-stem; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure: |