diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index 712bf2408ea..7ffff0f1c7f 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -3,4 +3,4 @@ variables: CONDITIONAL_BUILD_CROSVM_TAG: bb7f75d912ef43be8c9204385d79820a CONDITIONAL_BUILD_FLUSTER_TAG: 3bc3afd7468e106afcbfd569a85f34f9 CONDITIONAL_BUILD_PIGLIT_TAG: 009be6e9949c1121f67c8a3985b08505 - CONDITIONAL_BUILD_VKD3D_PROTON_TAG: dea4be3035832821bfb4bb24ec9c4308 + CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 31e89afb27aa6d9017c48b322c44df3e diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh index ea8dad9da42..b0124a42340 100644 --- a/.gitlab-ci/container/build-vkd3d-proton.sh +++ b/.gitlab-ci/container/build-vkd3d-proton.sh @@ -52,16 +52,16 @@ popd # Archive and upload vkd3d-proton for use as a LAVA overlay, if the archive doesn't exist yet ARTIFACT_PATH="${DATA_STORAGE_PATH}/vkd3d-proton/${VKD3D_PROTON_TAG}/${CI_JOB_NAME}/${VKD3D_PROTON_S3_ARTIFACT}" if FOUND_ARTIFACT_URL="$(find_s3_project_artifact "${ARTIFACT_PATH}")"; then - echo "Found vkd3d-proton at: ${FOUND_ARTIFACT_URL}, skipping upload" + echo "Found vkd3d-proton at: ${FOUND_ARTIFACT_URL}, skipping upload" else - echo "Uploaded vkd3d-proton not found, reuploading..." - tar --zstd -cf "$VKD3D_PROTON_S3_ARTIFACT" -C / "${VKD3D_PROTON_DST_DIR#/}" "${VKD3D_PROTON_WINE_DIR#/}" - ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$VKD3D_PROTON_S3_ARTIFACT" \ - "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}" + echo "Uploaded vkd3d-proton not found, reuploading..." + tar --zstd -cf "$VKD3D_PROTON_S3_ARTIFACT" -C / "${VKD3D_PROTON_DST_DIR#/}" "${VKD3D_PROTON_WINE_DIR#/}" + ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$VKD3D_PROTON_S3_ARTIFACT" \ + "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}" + rm "$VKD3D_PROTON_S3_ARTIFACT" fi rm -rf "$VKD3D_PROTON_BUILD_DIR" rm -rf "$VKD3D_PROTON_SRC_DIR" -rm "$VKD3D_PROTON_S3_ARTIFACT" section_end vkd3d-proton