aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml35
1 files changed, 24 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90d6b32dd0..92a7c51306 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,6 +49,7 @@ variables:
echo Etc/UTC > /etc/timezone
mkdir -p apt-cache
export APT_CACHE_DIR="$(pwd)/apt-cache"
+ rm -f /etc/apt/apt.conf.d/docker-clean
echo 'quiet "1";' \
'Acquire::Retries "20";' \
'APT::Install-Recommends "0";' \
@@ -79,9 +80,11 @@ variables:
- *apt-template
# Install patches unconditionally.
- apt-get install
+ apt-utils
automake
build-essential
ca-certificates
+ file
git
libevent-dev
liblzma-dev
@@ -100,15 +103,15 @@ variables:
# llvm-symbolizer for sanitizer backtrace
- if [ "$HARDENING" = yes ]; then apt-get install llvm; fi
# TODO: This next line should not be debian-only.
- - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+ - 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://git.torproject.org/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"; fi
- if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi
# Minimal check on debian: just make, make check.
#
debian-minimal:
- image: debian:buster
+ image: debian:bullseye
<<: *debian-template
script:
- ./scripts/ci/ci-driver.sh
@@ -116,7 +119,7 @@ debian-minimal:
# Minimal check on debian/i386: just make, make check.
#
debian-i386-minimal:
- image: i386/debian:buster
+ image: i386/debian:bullseye
<<: *debian-template
script:
- ./scripts/ci/ci-driver.sh
@@ -139,7 +142,7 @@ debian-hardened:
#####
# Distcheck on debian stable
debian-distcheck:
- image: debian:buster
+ image: debian:bullseye
<<: *debian-template
variables:
DISTCHECK: "yes"
@@ -150,7 +153,7 @@ debian-distcheck:
#####
# Documentation tests on debian stable: doxygen and asciidoc.
debian-docs:
- image: debian:buster
+ image: debian:bullseye
<<: *debian-template
variables:
DOXYGEN: "yes"
@@ -168,7 +171,7 @@ debian-docs:
# with the 'artifacts' mechanism, in theory, but it would be good to
# avoid having to have a system with hundreds of artifacts.
debian-integration:
- image: debian:buster
+ image: debian:bullseye
<<: *debian-template
variables:
CHECK: "no"
@@ -182,7 +185,7 @@ debian-integration:
#####
# Tracing build on Debian stable.
debian-tracing:
- image: debian:buster
+ image: debian:bullseye
<<: *debian-template
variables:
TRACING: "yes"
@@ -194,7 +197,7 @@ debian-tracing:
#####
# No-authority mode
debian-disable-dirauth:
- image: debian:buster
+ image: debian:bullseye
<<: *debian-template
variables:
DISABLE_DIRAUTH: "yes"
@@ -204,7 +207,7 @@ debian-disable-dirauth:
#####
# No-relay mode
debian-disable-relay:
- image: debian:buster
+ image: debian:bullseye
<<: *debian-template
variables:
DISABLE_RELAY: "yes"
@@ -212,9 +215,19 @@ debian-disable-relay:
- ./scripts/ci/ci-driver.sh
#####
+# GPL licensed mode, enables pow module
+debian-gpl:
+ image: debian:buster
+ <<: *debian-template
+ variables:
+ GPL: "yes"
+ script:
+ - ./scripts/ci/ci-driver.sh
+
+#####
# NSS check on debian
debian-nss:
- image: debian:buster
+ image: debian:bullseye
<<: *debian-template
variables:
NSS: "yes"