Skip to content

Commit 7b4615f

Browse files
committed
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
1 parent 399a43d commit 7b4615f

File tree

2 files changed

+26
-3
lines changed

2 files changed

+26
-3
lines changed

.github/workflows/build-and-test.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,19 @@ jobs:
7777
sdk-preview: true
7878
runtime: -x64
7979
codecov: false
80+
- os: macos-26
81+
framework: net9.0
82+
sdk: 9.0.x
83+
sdk-preview: true
84+
runtime: -x64
85+
codecov: false
8086
- os: windows-latest
8187
framework: net9.0
8288
sdk: 9.0.x
8389
sdk-preview: true
8490
runtime: -x64
8591
codecov: false
86-
- os: buildjet-4vcpu-ubuntu-2204-arm
92+
- os: ubuntu-22.04-arm
8793
framework: net9.0
8894
sdk: 9.0.x
8995
sdk-preview: true
@@ -100,12 +106,17 @@ jobs:
100106
sdk: 8.0.x
101107
runtime: -x64
102108
codecov: false
109+
- os: macos-26
110+
framework: net8.0
111+
sdk: 8.0.x
112+
runtime: -x64
113+
codecov: false
103114
- os: windows-latest
104115
framework: net8.0
105116
sdk: 8.0.x
106117
runtime: -x64
107118
codecov: false
108-
- os: buildjet-4vcpu-ubuntu-2204-arm
119+
- os: ubuntu-22.04-arm
109120
framework: net8.0
110121
sdk: 8.0.x
111122
runtime: -x64
@@ -124,6 +135,18 @@ jobs:
124135
sudo apt-get update
125136
sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
126137
138+
- name: Install libgdi+, which is required for tests running on macos
139+
if: ${{ contains(matrix.options.os, 'macos-26') }}
140+
run: |
141+
brew update
142+
brew install mono-libgdiplus
143+
# Create symlinks to make libgdiplus discoverable
144+
sudo mkdir -p /usr/local/lib
145+
sudo ln -sf $(brew --prefix)/lib/libgdiplus.dylib /usr/local/lib/libgdiplus.dylib
146+
# Verify installation
147+
ls -la $(brew --prefix)/lib/libgdiplus* || echo "libgdiplus not found in brew prefix"
148+
ls -la /usr/local/lib/libgdiplus* || echo "libgdiplus not found in /usr/local/lib"
149+
127150
- name: Git Config
128151
shell: bash
129152
run: |

tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public void TiffDecoder_CanDecode_YccK<TPixel>(TestImageProvider<TPixel> provide
360360
{
361361
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
362362
image.DebugSave(provider);
363-
image.CompareToReferenceOutput(ImageComparer.Exact, provider);
363+
image.CompareToReferenceOutput(ImageComparer.Tolerant(), provider);
364364
}
365365

366366
[Theory]

0 commit comments

Comments
 (0)