From 92f22edb88a410966e63fc70e764474b89e986d2 Mon Sep 17 00:00:00 2001
From: Giovanni Mascellani <gmascellani@codeweavers.com>
Date: Thu, 30 Oct 2025 20:37:32 +0100
Subject: [PATCH] ci: Merge job test-win-64-dxc into test-win-64.

DXC doesn't fail any more, so there is no need for two jobs.
---
 gitlab/test.yml | 50 +++++++++++++------------------------------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/gitlab/test.yml b/gitlab/test.yml
index 249b0d2d8..b04d09726 100644
--- a/gitlab/test.yml
+++ b/gitlab/test.yml
@@ -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'