diff options
| author | Simon Ser <contact@emersion.fr> | 2022-09-08 11:41:15 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-09-13 18:46:46 +0000 |
| commit | 985ab55d59db45ea62795c76dff5949343e86b2f (patch) | |
| tree | 1241430d01270582b3c2f365cf271b2213c12a55 | |
| parent | e1053607830719c28fe8c189d9e5bd3a799aaa0b (diff) | |
| download | wayland-985ab55d59db45ea62795c76dff5949343e86b2f.tar.gz | |
ci: upgrade images
Upgrade Debian to bullseye and FreeBSD to 13.1. FreeBSD 13.0 is
not supported anymore, and this ensures we still build on fresh
images.
Signed-off-by: Simon Ser <contact@emersion.fr>
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc1b006..f7f74ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ # API changes. If you need new features from ci-templates you must bump # this to the current SHA you require from the ci-templates repo, however # be aware that you may need to account for API changes when doing so. -.templates_sha: &template_sha 567700e483aabed992d0a4fea84994a0472deff6 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha d5aa3941aa03c2f716595116354fb81eb8012acb # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: - project: 'freedesktop/ci-templates' @@ -72,12 +72,12 @@ stages: .os-debian: variables: BUILD_OS: debian - FDO_DISTRIBUTION_VERSION: buster + FDO_DISTRIBUTION_VERSION: bullseye FDO_DISTRIBUTION_PACKAGES: 'build-essential pkg-config libexpat1-dev libffi-dev libxml2-dev doxygen graphviz xmlto xsltproc docbook-xsl python3-pip python3-setuptools ninja-build' FDO_DISTRIBUTION_EXEC: 'pip3 install meson==0.56.0' # bump this tag every time you change something which requires rebuilding the # base image - FDO_DISTRIBUTION_TAG: "2022-02-05.0" + FDO_DISTRIBUTION_TAG: "2022-08-08.0" .debian-x86_64: extends: @@ -301,11 +301,11 @@ armv7-release-debian-build: .os-freebsd: variables: BUILD_OS: freebsd - FDO_DISTRIBUTION_VERSION: "13.0" + FDO_DISTRIBUTION_VERSION: "13.1" FDO_DISTRIBUTION_PACKAGES: 'libxslt meson ninja pkgconf expat libffi libepoll-shim libxml2' # bump this tag every time you change something which requires rebuilding the # base image - FDO_DISTRIBUTION_TAG: "2021-08-05.0" + FDO_DISTRIBUTION_TAG: "2022-09-08.0" # Don't build documentation since installing the required tools massively # increases the VM image (and therefore container) size. MESON_ARGS: "-Ddocumentation=false" |