Merge branch 'main' into sn/upd/xunit

SixLabors · Feb 28, 2025 · 1bb255f · 1bb255f
2 parents e242b46 + e20e47f
commit 1bb255f
Show file tree

Hide file tree

Showing 47 changed files with 474 additions and 413 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -73,7 +73,7 @@ jobs:
 
     steps:
       - name: Install libgdi+, which is required for tests running on ubuntu
-        if: ${{ matrix.options.os == 'buildjet-4vcpu-ubuntu-2204-arm' }}
+        if: ${{ contains(matrix.options.os, 'ubuntu') }}
         run: sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
 
       - name: Git Config

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -17,6 +17,11 @@ jobs:
     runs-on: ${{matrix.options.os}}
 
     steps:
+
+      - name: Install libgdi+, which is required for tests running on ubuntu
+        if: ${{ contains(matrix.options.os, 'ubuntu') }}
+        run: sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
+
       - name: Git Config
         shell: bash
         run: |