From 7b4615f70c25dbd831f9d5ec675d5a88b45e28a9 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Sun, 16 Nov 2025 09:11:25 +0100
Subject: [PATCH] Add ARM hosted runners

Added macos-26 and ubuntu-2204 github runners which run on arm

Use Tolerant ImageComparer

We now use the tolerant Image Comparer for now.

Disable Tests which need libgdiplus

This disables all tests which need libgdiplus for macs with arm.
The hosted runners do not have libgdiplus installed

Install libgdiplus on mac

Enable disabled tests on arm

Try to create symlink

Try without fallback path

Skip on linux

This was removed by mistake

Remove whitespace
---
 .github/workflows/build-and-test.yml          | 27 +++++++++++++++++--
 .../Formats/Tiff/TiffDecoderTests.cs          |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e00757cb7b..3e3d6d0e27 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -77,13 +77,19 @@ jobs:
             sdk-preview: true
             runtime: -x64
             codecov: false
+          - os: macos-26
+            framework: net9.0
+            sdk: 9.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
           - os: windows-latest
             framework: net9.0
             sdk: 9.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
-          - os: buildjet-4vcpu-ubuntu-2204-arm
+          - os: ubuntu-22.04-arm
             framework: net9.0
             sdk: 9.0.x
             sdk-preview: true
@@ -100,12 +106,17 @@ jobs:
             sdk: 8.0.x
             runtime: -x64
             codecov: false
+          - os: macos-26
+            framework: net8.0
+            sdk: 8.0.x
+            runtime: -x64
+            codecov: false
           - os: windows-latest
             framework: net8.0
             sdk: 8.0.x
             runtime: -x64
             codecov: false
-          - os: buildjet-4vcpu-ubuntu-2204-arm
+          - os: ubuntu-22.04-arm
             framework: net8.0
             sdk: 8.0.x
             runtime: -x64
@@ -124,6 +135,18 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
 
+      - name: Install libgdi+, which is required for tests running on macos
+        if: ${{ contains(matrix.options.os, 'macos-26') }}
+        run: |
+          brew update
+          brew install mono-libgdiplus
+          # Create symlinks to make libgdiplus discoverable
+          sudo mkdir -p /usr/local/lib
+          sudo ln -sf $(brew --prefix)/lib/libgdiplus.dylib /usr/local/lib/libgdiplus.dylib
+          # Verify installation
+          ls -la $(brew --prefix)/lib/libgdiplus* || echo "libgdiplus not found in brew prefix"
+          ls -la /usr/local/lib/libgdiplus* || echo "libgdiplus not found in /usr/local/lib"
+
       - name: Git Config
         shell: bash
         run: |
diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
index 26dc4f5878..5df730cb1d 100644
--- a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
@@ -360,7 +360,7 @@ public void TiffDecoder_CanDecode_YccK<TPixel>(TestImageProvider<TPixel> provide
     {
         using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
         image.DebugSave(provider);
-        image.CompareToReferenceOutput(ImageComparer.Exact, provider);
+        image.CompareToReferenceOutput(ImageComparer.Tolerant(), provider);
     }
 
     [Theory]