Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin J. Thompson
Tor
Commits
4fd4e271
Commit
4fd4e271
authored
6 years ago
by
rl1987
Committed by
Nick Mathewson
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Try putting stem repo cloning into install part of config
Also print stem version when we have it downloaded
parent
bee9093b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.travis.yml
+3
-1
3 additions, 1 deletion
.travis.yml
with
3 additions
and
1 deletion
.travis.yml
+
3
−
1
View file @
4fd4e271
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment