ci: Deduplicate the CI configuration for Windows.

This commit is contained in:
Giovanni Mascellani 2023-11-15 12:30:59 +01:00 committed by Alexandre Julliard
parent beb3f6e0c2
commit 50a56f6aeb
Notes: Alexandre Julliard 2023-11-23 22:49:33 +01:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/474

View File

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