From d54bd30d6361891e26afd9cac9e265c998c176ad Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Tue, 8 Jun 2021 09:30:17 +0200 Subject: [PATCH] ci:bump mesa version Signed-off-by: Gert Wollny Reviewed-by: Tomeu Vizoso --- ci/.gitlab-ci.yml | 2 +- ci/build-container.sh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/.gitlab-ci.yml b/ci/.gitlab-ci.yml index b6c5b32..8aceb23 100644 --- a/ci/.gitlab-ci.yml +++ b/ci/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - FDO_DISTRIBUTION_TAG: "2021-06-06" + FDO_DISTRIBUTION_TAG: "2021-06-08" FDO_DISTRIBUTION_VERSION: bullseye FDO_UPSTREAM_REPO: "virgl/virglrenderer" TEST_IMAGE: "$CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" diff --git a/ci/build-container.sh b/ci/build-container.sh index d61059a..7c28e4b 100644 --- a/ci/build-container.sh +++ b/ci/build-container.sh @@ -103,7 +103,7 @@ git clone --shallow-since="$GIT_DATE" https://gitlab.freedesktop.org/mesa/drm.gi [ "$?" = "0" ] || exit 1 popd -export KNOWN_GOOD_MESA=${KNOWN_GOOD_MESA:-7db79fa6773bd4168980fad5c8c8785adb34de76} +export KNOWN_GOOD_MESA=${KNOWN_GOOD_MESA:-2908aba828c39a322dff8fd3044b42955efebfdb} echo $KNOWN_GOOD_MESA export MESA_REPO=https://gitlab.freedesktop.org/mesa/mesa.git echo $MESA_REPO @@ -113,8 +113,7 @@ git clone --shallow-since="$GIT_DATE" ${MESA_REPO} . && \ git checkout ${KNOWN_GOOD_MESA} && \ git log --oneline -n 1 && \ mkdir -p build && \ - meson build/ && \ - meson configure build/ -Dprefix=/usr/local -Dplatforms=x11,wayland -Ddri-drivers= -Dgallium-drivers=swrast,iris,virgl,radeonsi -Dbuildtype=debugoptimized -Dllvm=true -Dglx=dri -Dgallium-vdpau=false -Dgallium-va=false -Dvulkan-drivers=[] -Dlibdir=lib && \ + meson build/ -Dprefix=/usr/local -Dplatforms=x11,wayland -Ddri-drivers= -Dgallium-drivers=swrast,iris,virgl,radeonsi -Dbuildtype=debugoptimized -Dllvm=true -Dglx=dri -Dgallium-vdpau=false -Dgallium-va=false -Dvulkan-drivers=[] -Dlibdir=lib && \ ninja -C build/ install >/dev/null && \ rm -rf /mesa [ "$?" = "0" ] || exit 1