OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Uprev virglrenderer and crosvm

Browse Source 
Ensure that we are using a recent virglrenderer to catch potential regressions
early.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15023>
This commit is contained in:
Corentin Noël
2022-02-09 15:17:20 +01:00
committed by Marge Bot
parent 3ef858a6f6
commit 1367424501
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci/container/build-crosvm.sh
View File

@@ -2,13 +2,15 @@
set -ex set -ex
CROSVM_VERSION=d2b6a64dd31c92a284a905c0f2483d0b222b1220 CROSVM_VERSION=f904b0ee258554bca9fed1b633b79e6d96003cf0
git clone --single-branch -b for-mesa-ci --no-checkout https://gitlab.freedesktop.org/tomeu/crosvm.git /platform/crosvm git clone --single-branch -b for-mesa-ci --no-checkout https://gitlab.freedesktop.org/tintou/crosvm.git /platform/crosvm
pushd /platform/crosvm pushd /platform/crosvm
git checkout "$CROSVM_VERSION" git checkout "$CROSVM_VERSION"
git submodule update --init git submodule update --init
VIRGLRENDERER_VERSION=2a5fb800c6b0ce15ad37c2c698635e3e2d27b37c VIRGLRENDERER_VERSION=1f1448ff100c19cf97ce1ad0d8fb5a9e63342fa6
rm -rf third_party/virglrenderer
git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
pushd third_party/virglrenderer pushd third_party/virglrenderer
git checkout "$VIRGLRENDERER_VERSION" git checkout "$VIRGLRENDERER_VERSION"
meson build/ $EXTRA_MESON_ARGS meson build/ $EXTRA_MESON_ARGS
@@ -31,4 +33,4 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
popd popd
rm -rf $PLATFORM2_ROOT $AOSP_EXTERNAL_ROOT/minijail $THIRD_PARTY_ROOT/adhd $THIRD_PARTY_ROOT/rust-vmm /platform/crosvm rm -rf /platform/crosvm

2
.gitlab-ci/image-tags.yml
View File

@@ -8,7 +8,7 @@ variables:
DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
DEBIAN_X86_TEST_GL_TAG: "2022-02-06-deqp" DEBIAN_X86_TEST_GL_TAG: "2022-02-14-virgl-update"
DEBIAN_X86_TEST_VK_TAG: "2022-02-06-deqp" DEBIAN_X86_TEST_VK_TAG: "2022-02-06-deqp"
FEDORA_X86_BUILD_TAG: "2021-12-31-refactor" FEDORA_X86_BUILD_TAG: "2021-12-31-refactor"

2
src/gallium/drivers/virgl/ci/traces-virgl.yml
View File

@@ -9,7 +9,7 @@ traces:
- path: glmark2/jellyfish.trace - path: glmark2/jellyfish.trace
expectations: expectations:
- device: gl-virgl - device: gl-virgl
checksum: 48a2ad1162bf92301cedbe53edf52a6b checksum: 1873b70a28539825879b530477cf6d27
- path: glxgears/glxgears-2.trace - path: glxgears/glxgears-2.trace
expectations: expectations:
- device: gl-virgl - device: gl-virgl