Merge branch 'maint-0.4.8' into release-0.4.8

This commit is contained in:
David Goulet 2024-11-19 10:24:44 -05:00
commit 5aa4d9195d

View File

@ -120,7 +120,7 @@ variables:
# Minimal check on debian: just make, make check.
#
debian-minimal:
image: debian:bullseye
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
script:
- ./scripts/ci/ci-driver.sh
@ -128,7 +128,12 @@ debian-minimal:
# Minimal check on debian/i386: just make, make check.
#
debian-i386-minimal:
image: i386/debian:bullseye
# TODO: Use a TPA-maintained image when there is one.
# See https://gitlab.torproject.org/tpo/tpa/base-images/-/issues/3
image:
name: i386/debian:bullseye
docker:
platform: linux/386
<<: *debian-template
script:
- ./scripts/ci/ci-driver.sh
@ -141,7 +146,7 @@ debian-i386-minimal:
#
# TODO: This will be faster once we merge #40098 and #40099.
debian-hardened:
image: debian:bullseye
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
variables:
ALL_BUGS_ARE_FATAL: "yes"
@ -153,7 +158,7 @@ debian-hardened:
#####
# Distcheck on debian stable
debian-distcheck:
image: debian:bullseye
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
variables:
DISTCHECK: "yes"
@ -164,7 +169,7 @@ debian-distcheck:
#####
# Documentation tests on debian stable: doxygen and asciidoc.
debian-docs:
image: debian:bullseye
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
variables:
DOXYGEN: "yes"
@ -182,7 +187,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:bullseye
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
variables:
CHECK: "no"
@ -196,7 +201,7 @@ debian-integration:
#####
# Tracing build on Debian stable.
debian-tracing:
image: debian:bullseye
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
variables:
TRACING: "yes"
@ -208,7 +213,7 @@ debian-tracing:
#####
# No-authority mode
debian-disable-dirauth:
image: debian:bullseye
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
variables:
DISABLE_DIRAUTH: "yes"
@ -218,7 +223,7 @@ debian-disable-dirauth:
#####
# No-relay mode
debian-disable-relay:
image: debian:bullseye
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
variables:
DISABLE_RELAY: "yes"
@ -228,7 +233,7 @@ debian-disable-relay:
#####
# GPL licensed mode, enables pow module
debian-gpl:
image: debian:buster
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
variables:
GPL: "yes"
@ -238,7 +243,7 @@ debian-gpl:
#####
# NSS check on debian
debian-nss:
image: debian:bullseye
image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
<<: *debian-template
variables:
NSS: "yes"