diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-24 16:05:41 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-03-08 22:04:51 +0000 |
| commit | adf7ca9fca675325757342626f7a31070807ff65 (patch) | |
| tree | eeda9635a5fe7d38c61e14f8542c7c7c4f216d96 /.gitlab-ci.yml | |
| parent | 7ed3b8e582e657f452fef196317163ca2eb54f6b (diff) | |
Add xserver-21.1 branch to CI build matrix
Also updates build container from Debian buster (10) to bookworm (12),
which in turn requires working around glvnd shipping gl.pc with a much
lower version number than Mesa had.
v2: use Debian bookworm (12) instead of bullseye (11)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/merge_requests/19>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52f9d491..4cd462b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,9 +9,10 @@ # recommended except for ephemeral images during development. # variables: - FDO_DISTRIBUTION_VERSION: buster-slim + FDO_DISTRIBUTION_VERSION: bookworm-slim FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2021-05-10" + FDO_DISTRIBUTION_PACKAGES: 'ca-certificates' + FDO_DISTRIBUTION_TAG: "2024-02-23.2" FDO_UPSTREAM_REPO: xorg/driver/xf86-video-ati # @@ -19,7 +20,7 @@ variables: # Please see the ci-templates documentation for details: # https://freedesktop.pages.freedesktop.org/ci-templates/ -.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 9568e38927f9e9c48d4f586f84a071c3a4bdcd39 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: - project: 'freedesktop/ci-templates' @@ -105,21 +106,22 @@ build-distcheck: - make install V=1 - make -j${FDO_CI_CONCURRENT:-4} distcheck variables: - XSERVER_VERSION: "1.20" + XSERVER_VERSION: "21.1" +# excludes version already checked in build-distcheck build-gcc: extends: - .default_build parallel: matrix: - - XSERVER_VERSION: ["1.16", "1.17", "1.18", "1.19"] + - XSERVER_VERSION: ["1.16", "1.17", "1.18", "1.19", "1.20"] build-clang: extends: - .default_build parallel: matrix: - - XSERVER_VERSION: ["1.20", "1.18", "1.19"] + - XSERVER_VERSION: ["1.18", "1.19", "1.20", "21.1"] variables: CC: clang |