From 9241e1bcd3c8379b0c25366c4758bee7a4262767 Mon Sep 17 00:00:00 2001
From: Giovanni Mascellani <gmascellani@codeweavers.com>
Date: Fri, 19 Apr 2024 23:41:55 +0200
Subject: [PATCH] ci: Run crosstests with DXC too.

This is added as a new job because some tests currently fail. A 32 bit
job is not created, instead, because a 32 bit dxcompiler.dll is not
available.
---
 gitlab/test.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gitlab/test.yml b/gitlab/test.yml
index a25918dcab..da01425f2d 100644
--- a/gitlab/test.yml
+++ b/gitlab/test.yml
@@ -26,3 +26,24 @@ test-win-32:
   variables:
     TEST_ARCH: "32"
     VKD3D_TESTS_SKIP_DXC: "1"
+
+test-win-64-dxc:
+  stage: test
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  interruptible: true
+  allow_failure: true
+  needs:
+    - job: build-crosstest
+  tags:
+    - win10-21h2
+  script:
+    - 'Invoke-WebRequest -Uri "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2308/dxc_2023_08_14.zip" -OutFile ".\dxc.zip"'
+    - 'Expand-Archive -Path "dxc.zip" -DestinationPath ".\dxc"'
+    - '$Env:PATH += ";" + (Convert-Path ".\dxc\bin\x64")'
+    - 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
-- 
GitLab