fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci/test-vk: Install win64 apitrace 14.0 along with setting up wine.

Browse source 
This will let us replay d3d traces in replay testing.  This replaces a
dead apitrace script that used to be used in CI.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40959>
This commit is contained in:
Emma Anholt 2026-03-11 12:33:30 -07:00 • committed by Marge Bot
parent 0596569722
commit 735a9e9fac
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.gitlab-ci/container/build-wine.sh
View file

@ -43,6 +43,26 @@ while ! test -f "${WINEPREFIX}/system.reg"; do sleep 1; done
section_end wine section_end wine
section_start wine-apitrace "Setting up Apitrace for Wine"
APITRACE_VERSION="14.0"
APITRACE_VERSION_DATE=""
APITRACE_ARCH=""
if [ "$DEBIAN_ARCH" == "arm64" ]; then
APITRACE_ARCH="-arm"
fi
curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
"https://github.com/apitrace/apitrace/releases/download/${APITRACE_VERSION}/apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}.7z"
7zr x "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}.7z" \
"apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}/bin/apitrace.exe" \
"apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}/bin/d3dretrace.exe"
mv "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}" /apitrace-msvc-win64
rm "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}.7z"
section_end wine-apitrace
# Archive and upload wine for use as a LAVA overlay, if the archive doesn't exist yet # Archive and upload wine for use as a LAVA overlay, if the archive doesn't exist yet
WINE_S3_ARTIFACT="wine.tar.zst" WINE_S3_ARTIFACT="wine.tar.zst"
@ -53,6 +73,7 @@ else
echo "Uploaded wine not found, reuploading..." echo "Uploaded wine not found, reuploading..."
tar --zstd -cf "$WINE_S3_ARTIFACT" -C / \ tar --zstd -cf "$WINE_S3_ARTIFACT" -C / \
"${WINEPREFIX#/}" \ "${WINEPREFIX#/}" \
/apitrace-msvc-win64 \
/usr/lib/*/wine /usr/lib/*/wine
ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$WINE_S3_ARTIFACT" \ ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$WINE_S3_ARTIFACT" \
"https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}" "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}"

1
.gitlab-ci/container/fdo_cntr_export.sh
View file

@ -48,6 +48,7 @@ buildah_export() {
# These components will be provided via LAVA overlays, # These components will be provided via LAVA overlays,
# so remove them from the core rootfs # so remove them from the core rootfs
rm -rf "${mountpoint}/android-cts" rm -rf "${mountpoint}/android-cts"
rm -rf "${mountpoint}/apitrace-msvc-win64"
rm -rf "${mountpoint}/cuttlefish" rm -rf "${mountpoint}/cuttlefish"
rm -rf "${mountpoint}/fluster/resources" rm -rf "${mountpoint}/fluster/resources"
rm -rf "${mountpoint}/usr/lib/*/wine" rm -rf "${mountpoint}/usr/lib/*/wine"

16
.gitlab-ci/container/install-wine-apitrace.sh
View file

@ -1,16 +0,0 @@
#!/bin/bash
set -ue
APITRACE_VERSION="11.1"
APITRACE_VERSION_DATE=""
curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
"https://github.com/apitrace/apitrace/releases/download/${APITRACE_VERSION}/apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z"
7zr x "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z" \
"apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64/bin/apitrace.exe" \
"apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64/bin/d3dretrace.exe"
mv "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64" /apitrace-msvc-win64
rm "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z"