Skip to content

Fix MacOS jobs #2728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JimBobSquarePants merged 3 commits into from
Apr 26, 2024
Merged

Fix MacOS jobs #2728

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06312cb
Update TestFormat.cs
antonfirsov Apr 25, 2024
eb1c871
Update build-and-test.yml
antonfirsov Apr 25, 2024
aaeae24
Undo dummy change
antonfirsov Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
sdk: 8.0.x
runtime: -x64
codecov: false
- os: macos-latest
- os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
framework: net8.0
sdk: 8.0.x
runtime: -x64
Expand Down
3 changes: 1 addition & 2 deletions tests/ImageSharp.Tests/TestFormat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@ protected override Image<TPixel> Decode<TPixel>(TestDecoderOptions options, Stre
return this.testFormat.Sample<TPixel>();
}

protected override Image Decode(TestDecoderOptions options, Stream stream, CancellationToken cancellationToken)
=> this.Decode<TestPixelForAgnosticDecode>(options, stream, cancellationToken);
protected override Image Decode(TestDecoderOptions options, Stream stream, CancellationToken cancellationToken) => this.Decode<TestPixelForAgnosticDecode>(options, stream, cancellationToken);
Comment thread
antonfirsov marked this conversation as resolved.
Outdated
}

public class TestDecoderOptions : ISpecializedDecoderOptions
Expand Down