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>
This commit is contained in:

committed by
Marge Bot

parent
124b4097f3
commit
37970fa703
@@ -23,6 +23,8 @@ pushd /VK-GL-CTS
|
|||||||
|
|
||||||
mkdir -p /deqp
|
mkdir -p /deqp
|
||||||
|
|
||||||
|
echo "dEQP base version $DEQP_VERSION" > /deqp/version-log
|
||||||
|
|
||||||
# Patches to VulkanCTS may come from commits in their repo (listed in
|
# 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
|
# 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).
|
# directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
|
||||||
@@ -52,6 +54,9 @@ do
|
|||||||
git am < $OLDPWD/.gitlab-ci/container/patches/$patch
|
git am < $OLDPWD/.gitlab-ci/container/patches/$patch
|
||||||
done
|
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
|
# --insecure is due to SSL cert failures hitting sourceforge for zlib and
|
||||||
# libpng (sigh). The archives get their checksums checked anyway, and git
|
# libpng (sigh). The archives get their checksums checked anyway, and git
|
||||||
# always goes through ssh or https.
|
# 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
|
mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git -C /VK-GL-CTS describe --long > /deqp/version
|
|
||||||
|
|
||||||
# Copy out the mustpass lists we want.
|
# Copy out the mustpass lists we want.
|
||||||
mkdir /deqp/mustpass
|
mkdir /deqp/mustpass
|
||||||
for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
|
for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
|
||||||
|
@@ -166,7 +166,7 @@ fi
|
|||||||
|
|
||||||
uncollapsed_section_switch deqp "deqp: deqp-runner"
|
uncollapsed_section_switch deqp "deqp: deqp-runner"
|
||||||
|
|
||||||
echo "deqp $(cat /deqp/version)"
|
cat /deqp/version-log
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
if [ -z "$DEQP_SUITE" ]; then
|
if [ -z "$DEQP_SUITE" ]; then
|
||||||
|
Reference in New Issue
Block a user