summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorDavid Heidelberg <david.heidelberg@collabora.com>2023-04-26 10:54:42 +0200
committerMarge Bot <emma+marge@anholt.net>2023-04-29 07:07:27 +0000
commit02493aeffc2d8b3609379654dc5f54de6eab3412 (patch)
tree732fb492d4c1800dde24d1d985d284e5890c963f /.gitlab-ci
parenta3ae424e0c065c98d91bff6f201f6d1536288eaf (diff)
downloadmesa-02493aeffc2d8b3609379654dc5f54de6eab3412.tar.gz
ci/skqp: update to the Android CTS 12.1_r5 version
Reviewed-by: Eric Engestrom <eric@igalia.com> Signed-off-by: David Heidelberg <david.heidelberg@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22710>
Diffstat (limited to '.gitlab-ci')
-rwxr-xr-x.gitlab-ci/container/build-skqp.sh2
-rw-r--r--.gitlab-ci/image-tags.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
index bbb81c96760..4c03bcc72b3 100755
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -8,7 +8,7 @@
# .gitlab-ci/image-tags.yml tags:
# KERNEL_ROOTFS_TAG
-SKQP_BRANCH=android-cts-11.0_r7
+SKQP_BRANCH=android-cts-12.1_r5
create_gn_args() {
# gn can be configured to cross-compile skia and its tools
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index bd8be4ac502..a8de07b71eb 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -21,7 +21,7 @@ variables:
ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump"
FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng"
- KERNEL_ROOTFS_TAG: "2023-04-25-vvl"
+ KERNEL_ROOTFS_TAG: "2023-04-26-skqp-12.1-r5"
WINDOWS_X64_VS_PATH: "windows/x64_vs"
WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"