aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2024-10-24 11:43:14 -0400
committerDavid Goulet <dgoulet@torproject.org>2024-10-24 11:43:14 -0400
commit0e21b79227a6588376ecfde21cd1af7661c5be0b (patch)
tree8c29b9fb37c011822b23f880926247eacdb233e2
parent716b3d406e4c806fedc092b71883389aba5cce04 (diff)
parent3abcb33545d66cc76893840decbcfd1159562d37 (diff)
downloadtor-0e21b79227a6588376ecfde21cd1af7661c5be0b.tar.gz
tor-0e21b79227a6588376ecfde21cd1af7661c5be0b.zip
Merge branch 'maint-0.4.8'
-rw-r--r--.gitlab-ci.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e0c7ec842..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.