Giovanni Mascellani : ci: Deduplicate the CI configuration for Windows.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 50a56f6aebf7bd1c84d97f10ac967fcda6ecad8c
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/50a56f6aebf7bd1c84d97f10ac967f...

Author: Giovanni Mascellani 
Date:   Wed Nov 15 12:30:59 2023 +0100

ci: Deduplicate the CI configuration for Windows.

---

gitlab/test.yml | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/gitlab/test.yml b/gitlab/test.yml
index 97bebba5..cfc4906f 100644
--- a/gitlab/test.yml
+++ b/gitlab/test.yml
@@ -1,4 +1,4 @@
-test-win-64:
+.test-win:
   stage: test
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
@@ -9,27 +9,17 @@ test-win-64:
     - win10-21h2
   script:
     - ./artifacts/driver.cross64.exe
-  variables:
-    TEST_ARCH: "64"
   artifacts:
     when: always
     paths:
       - artifacts

+test-win-64:
+  extends: .test-win
+  variables:
+    TEST_ARCH: "64"
+
 test-win-32:
-  stage: test
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  interruptible: true
-  needs:
-    - job: build-crosstest
-  tags:
-    - win10-21h2
-  script:
-    - ./artifacts/driver.cross64.exe
+  extends: .test-win
   variables:
     TEST_ARCH: "32"
-  artifacts:
-    when: always
-    paths:
-      - artifacts