wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

ci: Merge job test-win-64-dxc into test-win-64.

Browse Source 
DXC doesn't fail any more, so there is no need for two jobs.
This commit is contained in:
Giovanni Mascellani
2025-10-30 20:37:32 +01:00
committed by Henri Verbeet
parent 12c713bbfa
commit 92f22edb88
Notes: Henri Verbeet 2025-11-03 18:01:36 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1810
1 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
gitlab/test.yml
View File

@@ -7,43 +7,6 @@
- job: build-crosstest
tags:
- win10-21h2
script:
- 'Invoke-WebRequest -Uri "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.16.1" -OutFile ".\warp.zip"'
- 'Expand-Archive -Path "warp.zip" -DestinationPath ".\warp"'
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec './artifacts/driver.cross64.exe $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)'
- if (Test-Path "pipeline_failed") { exit 1 }
artifacts:
when: always
paths:
- artifacts
exclude:
- artifacts/**/d3d10warp.dll
test-win-64:
extends: .test-win
variables:
TEST_ARCH: "64"
VKD3D_TEST_SKIP_DXC: "1"
VKD3D_TEST_DEBUG: '1'
test-win-32:
extends: .test-win
variables:
TEST_ARCH: "32"
VKD3D_TEST_SKIP_DXC: "1"
VKD3D_TEST_DEBUG: '1'
test-win-64-dxc:
stage: test
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
interruptible: true
needs:
- job: build-crosstest
tags:
- win10-21h2
variables:
VKD3D_TEST_DEBUG: '1'
script:
- 'Invoke-WebRequest -Uri "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.16.1" -OutFile ".\warp.zip"'
- 'Expand-Archive -Path "warp.zip" -DestinationPath ".\warp"'
@@ -58,3 +21,16 @@ test-win-64-dxc:
- artifacts
exclude:
- artifacts/**/d3d10warp.dll
test-win-64:
extends: .test-win
variables:
TEST_ARCH: "64"
VKD3D_TEST_DEBUG: '1'
test-win-32:
extends: .test-win
variables:
TEST_ARCH: "32"
VKD3D_TEST_SKIP_DXC: "1"
VKD3D_TEST_DEBUG: '1'