diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2023-04-26 15:51:15 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-05-02 18:12:45 +0000 |
| commit | a86e8969c7e6218416fe5dc39e6ada9893fc9e58 (patch) | |
| tree | 455ae86e8b215a97d24bbacc2dec4e4d7fd35e1b /.gitlab-ci | |
| parent | 53605f226b32a16c4b153388ad8256c4ee8303fc (diff) | |
| download | mesa-a86e8969c7e6218416fe5dc39e6ada9893fc9e58.tar.gz | |
ci: Uprev crosvm and virglrenderer
Update crosvm, virglrenderer and bindgen-cli to their latest version on time.
Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22712>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/build-crosvm.sh | 6 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index b79a870f637..1b23d98ef89 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -6,13 +6,13 @@ set -ex git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" -CROSVM_VERSION=00af43e1b565e1ae0047ba84b970da5e089e4f48 +CROSVM_VERSION=b018c19e23b6f77dc2ab6258d97711a6db2c56fc git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -VIRGLRENDERER_VERSION=fc2ad36998f8af8ea3cc68fb9c747dfec9cb4635 +VIRGLRENDERER_VERSION=0856ef1ee4e596a8b5e86c06ed5c71e390c3b3ea 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 @@ -25,7 +25,7 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \ bindgen-cli \ -j ${FDO_CI_CONCURRENT:-4} \ --root /usr/local \ - --version 0.63.0 \ + --version 0.65.1 \ $EXTRA_CARGO_ARGS RUSTFLAGS='-L native=/usr/local/lib' cargo install \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 7411c45807b..18840069f14 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2023-04-16-kernel-6.3" + DEBIAN_BASE_TAG: "2023-05-02-virglrenderer-crosvm" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2023-04-29-mold" @@ -21,7 +21,7 @@ variables: ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump" FEDORA_X86_BUILD_TAG: "2023-04-26-rusticl" - KERNEL_ROOTFS_TAG: "2023-04-26-skqp-12.1-r5" + KERNEL_ROOTFS_TAG: "2023-05-02-virglrenderer-crosvm" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" |