ci:bump mesa version

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
macos/master
Gert Wollny 4 years ago
parent 96dbcb8759
commit d54bd30d63
  1. 2
      ci/.gitlab-ci.yml
  2. 5
      ci/build-container.sh

@ -1,5 +1,5 @@
variables: variables:
FDO_DISTRIBUTION_TAG: "2021-06-06" FDO_DISTRIBUTION_TAG: "2021-06-08"
FDO_DISTRIBUTION_VERSION: bullseye FDO_DISTRIBUTION_VERSION: bullseye
FDO_UPSTREAM_REPO: "virgl/virglrenderer" FDO_UPSTREAM_REPO: "virgl/virglrenderer"
TEST_IMAGE: "$CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" TEST_IMAGE: "$CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"

@ -103,7 +103,7 @@ git clone --shallow-since="$GIT_DATE" https://gitlab.freedesktop.org/mesa/drm.gi
[ "$?" = "0" ] || exit 1 [ "$?" = "0" ] || exit 1
popd popd
export KNOWN_GOOD_MESA=${KNOWN_GOOD_MESA:-7db79fa6773bd4168980fad5c8c8785adb34de76} export KNOWN_GOOD_MESA=${KNOWN_GOOD_MESA:-2908aba828c39a322dff8fd3044b42955efebfdb}
echo $KNOWN_GOOD_MESA echo $KNOWN_GOOD_MESA
export MESA_REPO=https://gitlab.freedesktop.org/mesa/mesa.git export MESA_REPO=https://gitlab.freedesktop.org/mesa/mesa.git
echo $MESA_REPO echo $MESA_REPO
@ -113,8 +113,7 @@ git clone --shallow-since="$GIT_DATE" ${MESA_REPO} . && \
git checkout ${KNOWN_GOOD_MESA} && \ git checkout ${KNOWN_GOOD_MESA} && \
git log --oneline -n 1 && \ git log --oneline -n 1 && \
mkdir -p build && \ mkdir -p build && \
meson build/ && \ 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 && \
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 && \
ninja -C build/ install >/dev/null && \ ninja -C build/ install >/dev/null && \
rm -rf /mesa rm -rf /mesa
[ "$?" = "0" ] || exit 1 [ "$?" = "0" ] || exit 1

Loading…
Cancel
Save