summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2021-08-16 13:58:32 +0000
committerAlexander Færøy <ahf@torproject.org>2021-08-16 13:58:32 +0000
commit790107322ac7ce38dd39c906b636c425d94e53e0 (patch)
tree5fc6c23b6dfc1f6767e3a42fe59f597dba12f035
parentb2c4ac09d4220af181ac7df036e8ffeb2f421b58 (diff)
parentd1c781e67ee09c7c37ed9352147ddc2b2ca3236a (diff)
downloadtor-790107322ac7ce38dd39c906b636c425d94e53e0.tar.gz
tor-790107322ac7ce38dd39c906b636c425d94e53e0.zip
Merge branch 'maint-0.4.6' into main
-rw-r--r--.gitlab-ci.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8afd090a58..f7abf8362e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,7 +99,7 @@ variables:
# Minimal check on debian: just make, make check.
#
debian-minimal:
- image: debian:stable
+ image: debian:buster
<<: *debian-template
script:
- ./scripts/ci/ci-driver.sh
@@ -122,7 +122,7 @@ debian-hardened:
#####
# Distcheck on debian stable
debian-distcheck:
- image: debian:stable
+ image: debian:buster
<<: *debian-template
variables:
DISTCHECK: "yes"
@@ -133,7 +133,7 @@ debian-distcheck:
#####
# Documentation tests on debian stable: doxygen and asciidoc.
debian-docs:
- image: debian:stable
+ image: debian:buster
<<: *debian-template
variables:
DOXYGEN: "yes"
@@ -151,7 +151,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:stable
+ image: debian:buster
<<: *debian-template
variables:
CHECK: "no"
@@ -165,7 +165,7 @@ debian-integration:
#####
# Tracing build on Debian stable.
debian-tracing:
- image: debian:stable
+ image: debian:buster
<<: *debian-template
variables:
TRACING: "yes"
@@ -189,7 +189,7 @@ debian-tracing:
#####
# No-authority mode
debian-disable-dirauth:
- image: debian:stable
+ image: debian:buster
<<: *debian-template
variables:
DISABLE_DIRAUTH: "yes"
@@ -199,7 +199,7 @@ debian-disable-dirauth:
#####
# No-relay mode
debian-disable-relay:
- image: debian:stable
+ image: debian:buster
<<: *debian-template
variables:
DISABLE_RELAY: "yes"
@@ -221,7 +221,7 @@ debian-disable-relay:
#####
# NSS check on debian
debian-nss:
- image: debian:stable
+ image: debian:buster
<<: *debian-template
variables:
NSS: "yes"