Module: Mesa Branch: main Commit: 37970fa70376bb8a175701397afc985e85a732ff URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=37970fa70376bb8a175701397afc985e85a732ff
Author: Eric Engestrom <e...@igalia.com> Date: Thu Nov 2 17:24:00 2023 +0000 ci/build-deqp: print more detailed information about what deqp version is running `git describe` tells you that you have N patches on top of tag T, but not what these patches are, and the commit hash is useless as it is only valid during the container build. Replace this with: - the tag that we are checking out - the list of patches applied on top of it Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26013> --- .gitlab-ci/container/build-deqp.sh | 7 +++++-- .gitlab-ci/deqp-runner.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index c04be73d317..2b6bfe33c42 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -23,6 +23,8 @@ pushd /VK-GL-CTS mkdir -p /deqp +echo "dEQP base version $DEQP_VERSION" > /deqp/version-log + # Patches to VulkanCTS may come from commits in their repo (listed in # cts_commits_to_backport) or patch files stored in our repo (in the patch # directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files). @@ -52,6 +54,9 @@ do git am < $OLDPWD/.gitlab-ci/container/patches/$patch done +echo "The following local patches are applied on top:" >> /deqp/version-log +git log --reverse --oneline $DEQP_VERSION.. --format=%s | sed 's/^/- /' >> /deqp/version-log + # --insecure is due to SSL cert failures hitting sourceforge for zlib and # libpng (sigh). The archives get their checksums checked anyway, and git # always goes through ssh or https. @@ -91,8 +96,6 @@ if [ "${DEQP_TARGET}" = 'android' ]; then mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android fi -git -C /VK-GL-CTS describe --long > /deqp/version - # Copy out the mustpass lists we want. mkdir /deqp/mustpass for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index e8ae6573dbc..1b133dcb59e 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -166,7 +166,7 @@ fi uncollapsed_section_switch deqp "deqp: deqp-runner" -echo "deqp $(cat /deqp/version)" +cat /deqp/version-log set +e if [ -z "$DEQP_SUITE" ]; then
