pixman: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.d/03-test.yml                             |    1 -
 .gitlab-ci.d/meson-cross/windows-amd64-gnu.meson     |    3 +++
 .gitlab-ci.d/meson-cross/windows-amd64-llvm.meson    |    3 +++
 .gitlab-ci.d/meson-cross/windows-arm64-v8-llvm.meson |    3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 3cd8be9cc4505f8ed4d754d752ffe9715e532d84
Author: Marek Pikuła <m.pikula at partner.samsung.com>
Date:   Mon May 5 14:26:59 2025 +0200

    Revert "ci: Allow failures in windows-amd64 jobs"
    
    After disabling OpenMP, the Windows runs shouldn't fail.
    
    This reverts commit dd0750341d3d669df31ebf98d5c1ceb453005779.

diff --git a/.gitlab-ci.d/03-test.yml b/.gitlab-ci.d/03-test.yml
index 6afd99d..3657c54 100644
--- a/.gitlab-ci.d/03-test.yml
+++ b/.gitlab-ci.d/03-test.yml
@@ -117,7 +117,6 @@ include:
         - ""
         - "fast"
         - "wholeops"
-      allow_failure: true  # TODO: https://gitlab.freedesktop.org/pixman/pixman/-/issues/122
   - local: .gitlab-ci.d/templates/test.yml
     inputs:
       target: windows-arm64-v8
commit ccabf9f4448e249e936a4a18e95fed3a0f3538dd
Author: Marek Pikuła <m.pikula at partner.samsung.com>
Date:   Mon May 5 14:25:15 2025 +0200

    ci: Disable OpenMP for Windows targets
    
    Fixes #122 by disabling OpenMP for Windows targets. It was already done
    before for i686 variant (in !125), but it seems that 64-bit version is
    buggy as well. It looks like it doesn't increase job execution time
    significantly.
    
    Signed-off-by: Marek Pikuła <m.pikula at partner.samsung.com>

diff --git a/.gitlab-ci.d/meson-cross/windows-amd64-gnu.meson b/.gitlab-ci.d/meson-cross/windows-amd64-gnu.meson
index 41be631..388e361 100644
--- a/.gitlab-ci.d/meson-cross/windows-amd64-gnu.meson
+++ b/.gitlab-ci.d/meson-cross/windows-amd64-gnu.meson
@@ -5,6 +5,9 @@ strip = 'x86_64-w64-mingw32-strip'
 windres = 'x86_64-w64-mingw32-windres'
 exe_wrapper = 'wine'
 
+[project options]
+openmp = 'disabled'
+
 [host_machine]
 system = 'windows'
 cpu_family = 'x86_64'
diff --git a/.gitlab-ci.d/meson-cross/windows-amd64-llvm.meson b/.gitlab-ci.d/meson-cross/windows-amd64-llvm.meson
index ed3dab5..c998a7c 100644
--- a/.gitlab-ci.d/meson-cross/windows-amd64-llvm.meson
+++ b/.gitlab-ci.d/meson-cross/windows-amd64-llvm.meson
@@ -5,6 +5,9 @@ strip = 'x86_64-w64-mingw32-strip'
 windres = 'x86_64-w64-mingw32-windres'
 exe_wrapper = 'wine'
 
+[project options]
+openmp = 'disabled'
+
 [host_machine]
 system = 'windows'
 cpu_family = 'x86_64'
diff --git a/.gitlab-ci.d/meson-cross/windows-arm64-v8-llvm.meson b/.gitlab-ci.d/meson-cross/windows-arm64-v8-llvm.meson
index a984131..cffaa34 100644
--- a/.gitlab-ci.d/meson-cross/windows-arm64-v8-llvm.meson
+++ b/.gitlab-ci.d/meson-cross/windows-arm64-v8-llvm.meson
@@ -5,6 +5,9 @@ strip = 'aarch64-w64-mingw32-strip'
 windres = 'aarch64-w64-mingw32-windres'
 exe_wrapper = 'wine'
 
+[project options]
+openmp = 'disabled'
+
 [host_machine]
 system = 'windows'
 cpu_family = 'aarch64'