summaryrefslogtreecommitdiff
path: root/lib/libdrm/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2022-11-14 08:39:58 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2022-11-14 08:39:58 +0000
commiteb7b2da24a0f4fba243716cdf7336e718d6095b4 (patch)
treed8712ac93623fc4b6b7217d762d24ed2750911f9 /lib/libdrm/.gitlab-ci.yml
parent13d78d7be401f9ecff0bfee0c6779369816d1755 (diff)
Import libdrm 2.4.114
Diffstat (limited to 'lib/libdrm/.gitlab-ci.yml')
-rw-r--r--lib/libdrm/.gitlab-ci.yml24
1 files changed, 5 insertions, 19 deletions
diff --git a/lib/libdrm/.gitlab-ci.yml b/lib/libdrm/.gitlab-ci.yml
index 3c79867ad..4a3ed2141 100644
--- a/lib/libdrm/.gitlab-ci.yml
+++ b/lib/libdrm/.gitlab-ci.yml
@@ -44,7 +44,7 @@ stages:
FDO_DISTRIBUTION_EXEC: 'pip3 install meson==0.53.0'
# bump this tag every time you change something which requires rebuilding the
# base image
- FDO_DISTRIBUTION_TAG: "2022-01-19.0"
+ FDO_DISTRIBUTION_TAG: "2022-08-22.0"
.debian-x86_64:
extends:
@@ -68,10 +68,10 @@ stages:
variables:
BUILD_OS: freebsd
FDO_DISTRIBUTION_VERSION: "13.0"
- FDO_DISTRIBUTION_PACKAGES: 'meson ninja pkgconf libpciaccess libpthread-stubs py38-docutils cairo'
+ FDO_DISTRIBUTION_PACKAGES: 'meson ninja pkgconf libpciaccess libpthread-stubs py39-docutils cairo'
# bump this tag every time you change something which requires rebuilding the
# base image
- FDO_DISTRIBUTION_TAG: "2021-11-10.1"
+ FDO_DISTRIBUTION_TAG: "2022-08-22.0"
.freebsd-x86_64:
extends:
@@ -191,22 +191,8 @@ x86_64-freebsd-container_prep:
GIT_DEPTH: 10
script:
- meson build
- -D amdgpu=true
- -D cairo-tests=true
- -D etnaviv=true
- -D exynos=true
- -D freedreno=true
- -D freedreno-kgsl=true
- -D intel=true
- -D man-pages=true
- -D nouveau=true
- -D omap=true
- -D radeon=true
- -D tegra=true
+ --auto-features=enabled
-D udev=true
- -D valgrind=auto
- -D vc4=true
- -D vmwgfx=true
- ninja -C build
- ninja -C build test
- DESTDIR=$PWD/install ninja -C build install
@@ -227,7 +213,7 @@ x86_64-freebsd-container_prep:
# the workspace to see details about the failed tests.
- |
set +e
- /app/vmctl exec "pkg info; cd $CI_PROJECT_NAME ; meson build -D amdgpu=true -D cairo-tests=true -D intel=true -D man-pages=true -D nouveau=false -D radeon=true -D valgrind=auto && ninja -C build"
+ /app/vmctl exec "pkg info; cd $CI_PROJECT_NAME ; meson build --auto-features=enabled -D etnaviv=disabled -D nouveau=disabled -D valgrind=disabled && ninja -C build"
set -ex
scp -r vm:$CI_PROJECT_NAME/build/meson-logs .
/app/vmctl exec "ninja -C $CI_PROJECT_NAME/build install"