diff options
| author | David Goulet <dgoulet@torproject.org> | 2024-10-24 11:43:07 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2024-10-24 11:43:07 -0400 |
| commit | 3abcb33545d66cc76893840decbcfd1159562d37 (patch) | |
| tree | 663b33cb9f2cf20fc0517258b1cd222d2170df46 | |
| parent | 20b075eea82dbdc875b76e0b9a97ec85406c3790 (diff) | |
| parent | 09e91e2f5691c5770ff88a58557cc5eca054ab93 (diff) | |
| download | tor-3abcb33545d66cc76893840decbcfd1159562d37.tar.gz tor-3abcb33545d66cc76893840decbcfd1159562d37.zip | |
Merge branch 'tor-gitlab/mr/840' into maint-0.4.8
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f4a9b7af5..82176a1bfd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,15 @@ variables: # TODO: This next line should not be debian-only. - if [ "$STEM" = yes ]; then git clone --depth 1 https://gitlab.torproject.org/tpo/network-health/stem.git ; export STEM_PATH="$(pwd)/stem"; fi # TODO: This next line should not be debian-only. - - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://gitlab.torproject.org/tpo/core/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi + - | + if [ "$CHUTNEY" = yes ]; then + git clone --depth 1 https://gitlab.torproject.org/tpo/core/chutney.git + export CHUTNEY_PATH="$(pwd)/chutney" + # Have pip install chutney's python dependencies by installing chutney + # itself. + apt-get install python3-pip + pip3 install --user ./chutney + fi - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi # Minimal check on debian: just make, make check. @@ -270,4 +278,4 @@ rust-latest: - rustup show - cargo clippy --all-features --all-targets -- -D warnings after_script: - - cargo clean
\ No newline at end of file + - cargo clean |