[cairo-commit] 3 commits - .gitlab-ci/ignore-quartz-rgb24.txt .gitlab-ci.yml test/reference

[GitLab Mirror]

 .gitlab-ci.yml                           |    2 --
 .gitlab-ci/ignore-quartz-rgb24.txt       |    1 -
 test/reference/quartz-color-font.ref.png |binary
 3 files changed, 3 deletions(-)

New commits:
commit 8cb6deed39c7ac0d4a09ab4537cd0005ac738121
Merge: f672f20f0 c014a7dda
Author: Uli Schlachter <psychon at znc.in>
Date:   Fri Nov 18 15:54:40 2022 +0000

    Merge branch 'pass-quartz-tests' into 'master'
    
    Pass quartz tests
    
    See merge request cairo/cairo!367

commit c014a7dda3f6230a5c284ac67be6784cf37162eb
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Nov 17 13:46:10 2022 -0800

    Require macOS CI job to pass again.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5aab2b8ca..5f3ff2396 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -391,8 +391,6 @@ meson macOS:
     exclude:
       - "build/test/**/*.cs"
       - "build/test/**/*.trace"
-  # Unit tests on macOS have been failing for a while now, needs investigating..
-  allow_failure: true
   before_script:
     # Install the DejaVu fonts
     - curl -LO https://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-2.37.zip
commit 04cf47b57aa3ffa267012af48f1965e134a43b48
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Nov 17 13:41:50 2022 -0800

    Change expected fails and reference image so that Quartz CI passes.

diff --git a/.gitlab-ci/ignore-quartz-rgb24.txt b/.gitlab-ci/ignore-quartz-rgb24.txt
index 47a12de09..0941d59cd 100644
--- a/.gitlab-ci/ignore-quartz-rgb24.txt
+++ b/.gitlab-ci/ignore-quartz-rgb24.txt
@@ -1,5 +1,4 @@
 a1-clip-fill-rule
-alpha-similar
 big-empty-box
 big-empty-triangle
 big-little-box
diff --git a/test/reference/quartz-color-font.ref.png b/test/reference/quartz-color-font.ref.png
index e52674ba0..0c185ae1b 100644
Binary files a/test/reference/quartz-color-font.ref.png and b/test/reference/quartz-color-font.ref.png differ