diff options
author | Simon McVittie <smcv@collabora.com> | 2022-02-25 13:48:05 +0000 |
---|---|---|
committer | Simon McVittie <smcv@collabora.com> | 2022-02-25 14:08:55 +0000 |
commit | cfbc3a429e34fb2d973b463fe6855c5a25901bd3 (patch) | |
tree | 9b39ace0aebb793f3d27eae00eb6bb5818cdb7d8 /.gitlab-ci.yml | |
parent | 69c610f6f084a3f68994043d2bf11f18016e8052 (diff) | |
download | dbus-cfbc3a429e34fb2d973b463fe6855c5a25901bd3.tar.gz |
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>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea8a9d12..7c0f4ba8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 |