[PATCH v3 0/2] MR8299: Draft: gitlab: Remove name containing CI environment variables in windows tests.
This is an alternative location to filter out this environment variables, see merge request !8292 for details. Doing this in winetest would have the advantage to protect all tests run by it, not just kernel32:process. -- v3: gitlab: Remove name containing CI environment variables in windows tests. gitlab: Derive the windows tests from a common .wine-test-windows. https://gitlab.winehq.org/wine/wine/-/merge_requests/8299
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- tools/gitlab/test.yml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 2c56ca5cc78..e2deff8c13d 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -47,6 +47,12 @@ - wineserver -w - printf '\e[0Ksection_end:%s:wine_test_prepare_env\r\e[0K' "$(date +%s)" +.wine-test-windows: + stage: test + interruptible: true + variables: + GIT_STRATEGY: none + test-linux-64: extends: .wine-test variables: @@ -84,10 +90,7 @@ test-linux-32: junit: winetest.xml test-win10-21h2-32: - stage: test - interruptible: true - variables: - GIT_STRATEGY: none + extends: .wine-test-windows rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' needs: @@ -115,10 +118,7 @@ test-win10-21h2-32: junit: winetest.xml test-win10-21h2-64: - stage: test - interruptible: true - variables: - GIT_STRATEGY: none + extends: .wine-test-windows rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' needs: @@ -164,10 +164,7 @@ debian-64: - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q win10-21h2-32: - stage: test - interruptible: true - variables: - GIT_STRATEGY: none + extends: .wine-test-windows rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: @@ -178,10 +175,7 @@ win10-21h2-32: - ./winetest.exe -q win10-21h2-64: - stage: test - interruptible: true - variables: - GIT_STRATEGY: none + extends: .wine-test-windows rules: - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8299
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- tools/gitlab/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index e2deff8c13d..8ceba9867fb 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -52,6 +52,10 @@ interruptible: true variables: GIT_STRATEGY: none + # Non-ascii characters in authors name may get into the output of kernel32:process test which cause + # qemu-agent.py in Windows to fail with: UnicodeDecodeError: 'utf-8' codec can't decode byte ... + CI_COMMIT_AUTHOR: "" + GITLAB_USER_NAME: "" test-linux-64: extends: .wine-test -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8299
On Sat Jun 21 14:29:13 2025 +0000, Bernhard Übelacker wrote:
changed this file in [version 3 of the diff](/wine/wine/-/merge_requests/8299/diffs?diff_id=187680&start_sha=a28b9643dd65289715fcd1da73ca9342f084e97f#d417fd0d0565983e1f95309ca207bcf870dd87ef) In https://gitlab.winehq.org/bernhardu/wine/-/merge_requests/3 I was just testing how I can remove the variable in gitlab config as Alexandre suggested. To not have to run for this a full CI cycle I disabled there the build and winetest run. I had hoped they will not make too much public noise ...
And I am sorry but I failed to remove the winetest patch in this MR in v2. In v3 now there are just the two gitlab config patches, [pipeline 44337](https://gitlab.winehq.org/bernhardu/wine/-/pipelines/44337) is still running. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8299#note_107510
On Sat Jun 21 14:36:58 2025 +0000, Bernhard Übelacker wrote:
In https://gitlab.winehq.org/bernhardu/wine/-/merge_requests/3 I was just testing how I can remove the variable in gitlab config as Alexandre suggested. To not have to run for this a full CI cycle I disabled there the build and winetest run. I had hoped they will not make too much public noise ... And I am sorry but I failed to remove the winetest patch in this MR in v2. In v3 now there are just the two gitlab config patches, [pipeline 44337](https://gitlab.winehq.org/bernhardu/wine/-/pipelines/44337) is still running. Ah, now I get where the misunderstanding came from. Yes, I was talking about the lingering winetest patch, which you removed now. Thanks.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8299#note_107512
On Sat Jun 21 14:41:39 2025 +0000, Jinoh Kang wrote:
Ah, now I get where the misunderstanding came from. Yes, I was talking about the lingering winetest patch, which you removed now. Thanks. So the "should be reverted now that we fixed it in CI" came from my "reduced" runs in the private merge request?
Then sorry for the confusion and I assume this change is still needed and it is safe to remove the draft state from this merge request? Does your "approved" still stand for the v3? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8299#note_107514
On Sat Jun 21 14:58:28 2025 +0000, Bernhard Übelacker wrote:
So the "should be reverted now that we fixed it in CI" came from my "reduced" runs in the private merge request? Then sorry for the confusion and I assume this change is still needed and it is safe to remove the draft state from this merge request? Does your "approved" still stand for the v3? Looks good to me.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8299#note_107515
On Sat Jun 21 14:58:28 2025 +0000, Jinoh Kang wrote:
Looks good to me. (FYI, in the future, you can "re-request" a review from an already approved reviewer, superseding previous approval)
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8299#note_107518
participants (2)
-
Bernhard Übelacker -
Jinoh Kang (＠iamahuman)