diff options
| author | David Goulet <dgoulet@torproject.org> | 2024-10-30 17:36:28 +0000 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2024-10-30 17:36:28 +0000 |
| commit | 6c8238f313af42c353aed3333e5074cc42030a09 (patch) | |
| tree | b96767b51b338ea7b8e6476ec34870644d37958c | |
| parent | 444ee53d34bd44064365276156026f3b5540878e (diff) | |
| parent | f79a5e66292b44a69d4327d83880543031c299e3 (diff) | |
| download | tor-6c8238f313af42c353aed3333e5074cc42030a09.tar.gz tor-6c8238f313af42c353aed3333e5074cc42030a09.zip | |
Merge branch 'pin-chutney' into 'main'
CI: use a fixed version of chutney
See merge request tpo/core/tor!843
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | changes/ci-pin-chutney | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82176a1bfd..34f2933928 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,7 +108,12 @@ variables: # 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 + # Use a fixed version of chutney to avoid surprise breakage. + CHUTNEY_SHALLOW_SINCE=2024-10-28 + CHUTNEY_COMMIT=be881a1e7c4bc8038fa13fde4a7b24e5c56349c4 + + git clone --shallow-since "$CHUTNEY_SHALLOW_SINCE" https://gitlab.torproject.org/tpo/core/chutney.git + git -C ./chutney checkout "$CHUTNEY_COMMIT" export CHUTNEY_PATH="$(pwd)/chutney" # Have pip install chutney's python dependencies by installing chutney # itself. diff --git a/changes/ci-pin-chutney b/changes/ci-pin-chutney new file mode 100644 index 0000000000..f572de9d92 --- /dev/null +++ b/changes/ci-pin-chutney @@ -0,0 +1,3 @@ + o Minor feature (testing, CI): + - Use a fixed version of chutney (be881a1e) instead of its current HEAD. + This version should also be preferred when testing locally. |