Module: Mesa Branch: main Commit: ae69494be00f97b9b6b05a40f06362c16807928e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae69494be00f97b9b6b05a40f06362c16807928e
Author: David Heidelberg <[email protected]> Date: Fri May 26 19:56:26 2023 +0200 ci/apitrace: include version with LTO enabled Reviewed-by: Guilherme Gallo <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23268> --- .gitlab-ci/container/build-apitrace.sh | 10 ++++++++-- .gitlab-ci/image-tags.yml | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh index 9ca0c3b6e1f..0697c3cb7f2 100644 --- a/.gitlab-ci/container/build-apitrace.sh +++ b/.gitlab-ci/container/build-apitrace.sh @@ -1,9 +1,15 @@ -#!/bin/bash +#!/usr/bin/env bash # shellcheck disable=SC2086 # we want word splitting +# When changing this file, you need to bump the following +# .gitlab-ci/image-tags.yml tags: +# DEBIAN_X86_64_TEST_GL_TAG +# DEBIAN_X86_64_TEST_VK_TAG +# KERNEL_ROOTFS_TAG + set -ex -APITRACE_VERSION="790380e05854d5c9d315555444ffcc7acb8f4037" +APITRACE_VERSION="0a6506433e1f9f7b69757b4e5730326970c4321a" git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace pushd /apitrace diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 4eb792d3318..4e095f67214 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -15,12 +15,12 @@ variables: DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-06-07-deqp" - DEBIAN_X86_64_TEST_GL_TAG: "2023-06-07-deqp" - DEBIAN_X86_64_TEST_VK_TAG: "2023-06-07-deqp" + DEBIAN_X86_64_TEST_GL_TAG: "2023-07-02-apitrace-lto" + DEBIAN_X86_64_TEST_VK_TAG: "2023-07-02-apitrace-lto" ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1" FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on" - KERNEL_ROOTFS_TAG: "2023-06-21-virglrenderer" + KERNEL_ROOTFS_TAG: "2023-07-02-apitrace-lto" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
