ci/vkd3d: Use structured tagging for vkd3d-proton
Structured tagging captures a checksum of the component we think we're building, and verifies this through the chain. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35167>
This commit is contained in:
committed by
Marge Bot
parent
84bee4571c
commit
2b7ddc7d71
@@ -7,6 +7,10 @@ set -ex
|
||||
|
||||
section_start vkd3d-proton "Building vkd3d-proton"
|
||||
|
||||
# Do a very early check to make sure the tag is correct without the need of
|
||||
# setting up the environment variables locally
|
||||
ci_tag_build_time_check "VKD3D_PROTON_TAG"
|
||||
|
||||
VKD3D_PROTON_COMMIT="041cfa75580090c6b30af2f2721015d15493f14b"
|
||||
|
||||
VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/container_job_trampoline.sh "${CI_JOB_NAME}"'
|
||||
# no need to pull the whole repo to build the container image
|
||||
GIT_STRATEGY: none
|
||||
CI_BUILD_COMPONENTS: "$CI_BUILD_COMPONENTS_ANGLE $CI_BUILD_COMPONENTS_CROSVM $CI_BUILD_COMPONENTS_FLUSTER $CI_BUILD_COMPONENTS_PIGLIT"
|
||||
CI_BUILD_COMPONENTS: "$CI_BUILD_COMPONENTS_ANGLE $CI_BUILD_COMPONENTS_CROSVM $CI_BUILD_COMPONENTS_FLUSTER $CI_BUILD_COMPONENTS_PIGLIT $CI_BUILD_COMPONENTS_VKD3D_PROTON"
|
||||
|
||||
.container-builds-angle:
|
||||
variables:
|
||||
@@ -91,6 +91,11 @@
|
||||
PIGLIT_TAG: "${CONDITIONAL_BUILD_PIGLIT_TAG}"
|
||||
CI_BUILD_COMPONENTS_PIGLIT: piglit
|
||||
|
||||
.container-builds-vkd3d-proton:
|
||||
variables:
|
||||
VKD3D_PROTON_TAG: "${CONDITIONAL_BUILD_VKD3D_PROTON_TAG}"
|
||||
CI_BUILD_COMPONENTS_VKD3D_PROTON: vkd3d-proton
|
||||
|
||||
.container-builds-android:
|
||||
extends:
|
||||
- .container-builds-angle
|
||||
@@ -115,6 +120,7 @@
|
||||
.container-builds-vk:
|
||||
extends:
|
||||
- .container-builds-piglit
|
||||
- .container-builds-vkd3d-proton
|
||||
|
||||
# Export the container rootfs and upload it to S3
|
||||
.export-container:
|
||||
|
||||
Reference in New Issue
Block a user