diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b16cc4248..cf0f8fc4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,9 +22,9 @@ variables: XORG_DEBIAN_VERSION: 'bullseye-slim' XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' XORG_DEBIAN_TAG: '2025-02-12-xvmc' - XORG_FREEBSD_VERSION: '14.0' + XORG_FREEBSD_VERSION: '14.1' XORG_FREEBSD_EXEC: '' - XORG_FREEBSD_TAG: '2025-02-12-fix-freebsd-xcb' + XORG_FREEBSD_TAG: '2024-06-10.0-1' include: - project: 'freedesktop/ci-templates' @@ -218,6 +218,8 @@ freebsd: - /app/vmctl start - set +e - scp -r $PWD "vm:" + # need to install extra packages, as long as image cant be rebuilt + - /app/vmctl exec "pkg update && pkg add libxvmc xcb-util xcb-util-wm" # need to install newer xorgproto - /app/vmctl exec "cd $CI_PROJECT_NAME/dep.xorgproto && ./autogen.sh --prefix=/usr && make && make install" - /app/vmctl exec "cd $CI_PROJECT_NAME && PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\" MESON_ARGS=\"$MESON_ARGS\" MESON_BUILDDIR=\"$MESON_BUILDDIR\" .gitlab-ci/meson-build.sh --skip-test" && touch .success