From: Rémi Bernon rbernon@codeweavers.com
--- tools/gitlab/build.yml | 22 +++++++++++++++++-- tools/gitlab/test.yml | 50 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 8a5d5b40ac1..47b677254cc 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -37,7 +37,7 @@ build-linux: script: - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux
-build-mac: +.build-mac: extends: .wine-build rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' @@ -52,6 +52,24 @@ build-mac: - export PATH="/usr/local/opt/ccache/libexec:$PATH" - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac
+build-winetest: + stage: build + image: $CI_REGISTRY/wine/wine:debian-bookworm + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - job: build-linux + variables: + GIT_STRATEGY: none + artifacts: + name: winetest + paths: + - winetest.exe + - winetest64.exe + script: + - mv usr/local/lib/wine/i386-windows/winetest.exe winetest.exe + - mv usr/local/lib/wine/x86_64-windows/winetest.exe winetest64.exe + build-daily-linux: extends: .wine-build rules: @@ -63,7 +81,7 @@ build-daily-linux: script: - ./tools/gitlab/build-linux
-build-winetest: +build-daily-winetest: stage: build image: $CI_REGISTRY/wine/wine:debian-bookworm rules: diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 590eacb2438..365135f2bc7 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -43,7 +43,7 @@ - wine wineboot.exe -u - wineserver -w
-test-linux-64: +.test-linux-64: extends: .wine-test variables: INCLUDE_TESTS: "dinput" @@ -55,7 +55,7 @@ test-linux-64: - export WINETEST_COLOR=1 - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL $INCLUDE_TESTS
-test-linux-32: +.test-linux-32: extends: .wine-test variables: EXCLUDE_TESTS: "d3d11:d3d11 d3d9:d3d9ex d3d9:visual" @@ -67,6 +67,48 @@ test-linux-32: - export WINETEST_COLOR=1 - wine usr/local/lib/wine/i386-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -n $EXCLUDE_TESTS
+test-win10-21h2-32: + stage: test + interruptible: true + variables: + GIT_STRATEGY: none + EXCLUDE_TESTS: "d3d11:d3d11 d3d9:d3d9ex d3d9:visual" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - job: build-winetest + tags: + - win10-21h2 + script: + - ./winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -n $EXCLUDE_TESTS >winetest.log + after_script: + - Get-Content ./winetest.log + artifacts: + when: always + paths: + - winetest.log + +test-win10-21h2-64: + stage: test + interruptible: true + variables: + GIT_STRATEGY: none + INCLUDE_TESTS: "dinput" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - job: build-winetest + tags: + - win10-21h2 + script: + - ./winetest64.exe -q -q -o - -t gitlab -u $CI_JOB_URL $INCLUDE_TESTS >winetest.log + after_script: + - Get-Content ./winetest.log + artifacts: + when: always + paths: + - winetest.log + debian-32: extends: .wine-test rules: @@ -93,7 +135,7 @@ win10-21h2-32: rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: - - job: build-winetest + - job: build-daily-winetest tags: - win10-21h2 script: @@ -107,7 +149,7 @@ win10-21h2-64: rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: - - job: build-winetest + - job: build-daily-winetest tags: - win10-21h2 script: