From: David Goulet <dgoulet@torproject.org>
Date: Wed, 19 Mar 2025 18:42:11 +0000 (-0400)
Subject: Merge branch 'maint-0.4.8'
X-Git-Tag: tor-0.4.9.2-alpha~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a252601ff0b83c28684c3a536efa877463ba8e2a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.8'
---

a252601ff0b83c28684c3a536efa877463ba8e2a
diff --cc .gitlab-ci.yml
index a595788320,fc0f616daf..3aff584a84
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -113,11 -115,11 +115,12 @@@ variables
  
          git clone --shallow-since "$CHUTNEY_SHALLOW_SINCE" https://gitlab.torproject.org/tpo/core/chutney.git
          git -C ./chutney checkout "$CHUTNEY_COMMIT"
+ 
+         apt install python3-venv
++
          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
+         python3 -m venv venv
+         venv/bin/pip install ./chutney
        fi
      - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi