diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2021-10-03 15:04:11 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2021-11-09 20:51:14 +0000 |
| commit | 1b945a695a0b9de5e756366bda3e28b172f19407 (patch) | |
| tree | 17d84e63448ddc6b5fdf1b1587645f247be0b778 | |
| parent | fde36d79920dee4c0ec399d44b4071d6b3f5b8c1 (diff) | |
ci: Bump libdrm for the android image.
Seems I bumped the tag previously but not the script. Let us do
better this time.
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13164>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/container/debian/android_build.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfcd679d1e8..360a53239c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -376,7 +376,7 @@ debian/android_build: extends: - .use-debian/x86_build-base variables: - MESA_IMAGE_TAG: &debian-android_build "2021-07-02-bump-libdrm" + MESA_IMAGE_TAG: &debian-android_build "2021-10-02-bump-libdrm-3" .use-debian/android_build: extends: diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh index 88c05af4ee2..45f75e1eb1f 100644 --- a/.gitlab-ci/container/debian/android_build.sh +++ b/.gitlab-ci/container/debian/android_build.sh @@ -29,7 +29,7 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi # Not using build-libdrm.sh because we don't want its cleanup after building # each arch. Fetch and extract now. -export LIBDRM_VERSION=libdrm-2.4.102 +export LIBDRM_VERSION=libdrm-2.4.107 wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz @@ -50,7 +50,8 @@ for arch in \ -Detnaviv=false \ -Dfreedreno=false \ -Dintel=false \ - -Dcairo-tests=false + -Dcairo-tests=false \ + -Dvalgrind=false ninja -C build-$arch install cd .. done |