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 
Update to their latest version on time

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23427>
This commit is contained in:
Corentin Noël
2023-06-05 09:40:57 +02:00
committed by Marge Bot
parent e1cd887b78
commit dd1b927805
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,13 +6,13 @@ set -ex
git config --global user.email "mesa@example.com" git config --global user.email "mesa@example.com"
git config --global user.name "Mesa CI" git config --global user.name "Mesa CI"
CROSVM_VERSION=b018c19e23b6f77dc2ab6258d97711a6db2c56fc CROSVM_VERSION=d0cbf0b23eb4bd2355b011184025c7c5d8749376
git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /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=74d35a57b3783110adee2e4a02d6f00cbc8f6810 VIRGLRENDERER_VERSION=bcc152ffdeec05d5bfe5d42f200933123d66c7db
rm -rf third_party/virglrenderer rm -rf third_party/virglrenderer
git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git 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
@@ -30,7 +30,7 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
--version 0.65.1 \ --version 0.65.1 \
$EXTRA_CARGO_ARGS $EXTRA_CARGO_ARGS
RUSTFLAGS='-L native=/usr/local/lib' cargo install \ CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-j ${FDO_CI_CONCURRENT:-4} \ -j ${FDO_CI_CONCURRENT:-4} \
--locked \ --locked \
--features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \ --features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \

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

@@ -1,6 +1,6 @@
variables: variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "2023-06-05-piglit-5036601c" DEBIAN_BASE_TAG: "2023-06-05-virgl-crosvm"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "2023-05-25-bookworm" DEBIAN_BUILD_TAG: "2023-05-25-bookworm"
@@ -21,7 +21,7 @@ variables:
ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1" ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1"
FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on" FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on"
KERNEL_ROOTFS_TAG: "2023-06-05-piglit-5036601c" KERNEL_ROOTFS_TAG: "2023-06-05-virgl-crosvm"
WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_PATH: "windows/x64_vs"
WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"