CI: Build on Debian 11 'bullseye' instead of Debian 10 'buster'

This is the current stable release for Debian, making Debian 10 a much
less interesting target for backports. Add a manually-triggered job
so we can still try buster occasionally.

Continue to use buster for mingw-w64 builds until format string issues
with bullseye toolchains can be sorted out.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-02-25 13:48:05 +00:00
parent 69c610f6f0
commit cfbc3a429e

View file

@ -20,7 +20,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
image: debian:buster-slim
image: debian:bullseye-slim
stages:
- 'build docker'
@ -32,7 +32,7 @@ variables:
ci_parallel: "2"
ci_sudo: "yes"
ci_distro: "debian"
ci_suite: "buster"
ci_suite: "bullseye"
###
# IMPORTANT
# These are the version tags for the docker images the CI runs against.
@ -73,7 +73,7 @@ windows amd64 docker:
.debian-build:
stage: build
image: "debian:buster-slim"
image: "debian:bullseye-slim"
cache:
key: ${CI_JOB_NAME}
paths:
@ -119,29 +119,44 @@ cmake:
i686-w64-mingw32-debug:
extends: .debian-build
image: "debian:buster-slim"
variables:
ci_host: "i686-w64-mingw32"
ci_suite: "buster"
ci_variant: "debug"
i686-w64-mingw32-cmake:
extends: .debian-build
image: "debian:buster-slim"
when: manual
variables:
ci_buildsys: "cmake"
ci_host: "i686-w64-mingw32"
ci_suite: "buster"
x86_64-w64-mingw32:
extends: .debian-build
image: "debian:buster-slim"
variables:
ci_host: "x86_64-w64-mingw32"
ci_suite: "buster"
x86_64-w64-mingw32-cmake-debug:
extends: .debian-build
image: "debian:buster-slim"
variables:
ci_buildsys: "cmake"
ci_host: "x86_64-w64-mingw32"
ci_suite: "buster"
ci_variant: "debug"
buster:
extends: .debian-build
when: manual
image: "debian:buster-slim"
variables:
ci_suite: "buster"
.win-build:
image: $WINDOWS_IMAGE
when: manual