mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-12-03 23:24:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci: uprev virglrenderer and crosvm

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21794>
This commit is contained in:
Corentin Noël 2023-03-08 17:15:46 +01:00 committed by Marge Bot
parent f406a9efa9
commit cd39a5ac8b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,13 +6,19 @@ 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=504899212d626ecf42b1c459e5592891dde5bf91 CROSVM_VERSION=7784d7dbad81ce2e7ec448ec7e821728a2d4ae72
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=49d4d0fe3eda5fa998b950809d4e9958f0d52da4 # Revert "minijail: remove MS_NOSYMFOLLOW def because ChromeOS is now on glibc 2.35."
# Debian Bullseye has only glibc 2.31
pushd third_party/minijail
git cherry-pick 0bbf93fdc58520525c85f311c176219bb1b4e96f
popd
VIRGLRENDERER_VERSION=f0e07bfd20ac6672643dfaf5e08318d8ec803750
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

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

@ -1,6 +1,6 @@
variables: variables:
DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
DEBIAN_BASE_TAG: "2023-02-23-virglrenderer" DEBIAN_BASE_TAG: "2023-03-13-virglrenderer-crosvm"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
DEBIAN_BUILD_TAG: "2023-02-14-pip" DEBIAN_BUILD_TAG: "2023-02-14-pip"
@ -21,7 +21,7 @@ variables:
ALPINE_X86_BUILD_TAG: "2023-02-26-add-bash-coreutils" ALPINE_X86_BUILD_TAG: "2023-02-26-add-bash-coreutils"
FEDORA_X86_BUILD_TAG: "2023-02-09-f36" FEDORA_X86_BUILD_TAG: "2023-02-09-f36"
KERNEL_ROOTFS_TAG: "2023-03-02-uprev-deqp" KERNEL_ROOTFS_TAG: "2023-03-13-virglrenderer-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"