Skip to content

Commit 7a983d3

Browse files
Update build pipeline
1 parent f1d51f9 commit 7a983d3

File tree

4 files changed

+31
-24
lines changed

4 files changed

+31
-24
lines changed

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

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
branches:
1212
- main
1313
- release/*
14-
types: [ labeled, opened, synchronize, reopened ]
14+
types: [ opened, synchronize, reopened ]
1515

1616
jobs:
1717
# Prime a single LFS cache and expose the exact key for the matrix
@@ -62,30 +62,28 @@ jobs:
6262
needs: WarmLFS
6363
strategy:
6464
matrix:
65-
isARM:
66-
- ${{ contains(github.event.pull_request.labels.*.name, 'arch:arm32') || contains(github.event.pull_request.labels.*.name, 'arch:arm64') }}
6765
options:
6866
- os: ubuntu-latest
69-
framework: net9.0
70-
sdk: 9.0.x
67+
framework: net10.0
68+
sdk: 10.0.x
7169
sdk-preview: true
7270
runtime: -x64
7371
codecov: false
74-
- os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
75-
framework: net9.0
76-
sdk: 9.0.x
72+
- os: macos-26
73+
framework: net10.0
74+
sdk: 10.0.x
7775
sdk-preview: true
7876
runtime: -x64
7977
codecov: false
8078
- os: windows-latest
81-
framework: net9.0
82-
sdk: 9.0.x
79+
framework: net10.0
80+
sdk: 10.0.x
8381
sdk-preview: true
8482
runtime: -x64
8583
codecov: false
86-
- os: buildjet-4vcpu-ubuntu-2204-arm
87-
framework: net9.0
88-
sdk: 9.0.x
84+
- os: ubuntu-22.04-arm
85+
framework: net10.0
86+
sdk: 10.0.x
8987
sdk-preview: true
9088
runtime: -x64
9189
codecov: false
@@ -94,8 +92,8 @@ jobs:
9492
framework: net8.0
9593
sdk: 8.0.x
9694
runtime: -x64
97-
codecov: false
98-
- os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
95+
codecov: true
96+
- os: macos-26
9997
framework: net8.0
10098
sdk: 8.0.x
10199
runtime: -x64
@@ -105,15 +103,11 @@ jobs:
105103
sdk: 8.0.x
106104
runtime: -x64
107105
codecov: false
108-
- os: buildjet-4vcpu-ubuntu-2204-arm
106+
- os: ubuntu-22.04-arm
109107
framework: net8.0
110108
sdk: 8.0.x
111109
runtime: -x64
112110
codecov: false
113-
exclude:
114-
- isARM: false
115-
options:
116-
os: buildjet-4vcpu-ubuntu-2204-arm
117111

118112
runs-on: ${{ matrix.options.os }}
119113

@@ -124,6 +118,18 @@ jobs:
124118
sudo apt-get update
125119
sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
126120
121+
- name: Install libgdi+, which is required for tests running on macos
122+
if: ${{ contains(matrix.options.os, 'macos-26') }}
123+
run: |
124+
brew update
125+
brew install mono-libgdiplus
126+
# Create symlinks to make libgdiplus discoverable
127+
sudo mkdir -p /usr/local/lib
128+
sudo ln -sf $(brew --prefix)/lib/libgdiplus.dylib /usr/local/lib/libgdiplus.dylib
129+
# Verify installation
130+
ls -la $(brew --prefix)/lib/libgdiplus* || echo "libgdiplus not found in brew prefix"
131+
ls -la /usr/local/lib/libgdiplus* || echo "libgdiplus not found in /usr/local/lib"
132+
127133
- name: Git Config
128134
shell: bash
129135
run: |
@@ -170,7 +176,7 @@ jobs:
170176
uses: actions/setup-dotnet@v4
171177
with:
172178
dotnet-version: |
173-
9.0.x
179+
10.0.x
174180
175181
- name: DotNet Build
176182
if: ${{ matrix.options.sdk-preview != true }}
@@ -214,6 +220,7 @@ jobs:
214220
if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
215221
with:
216222
flags: unittests
223+
token: ${{ secrets.CODECOV_TOKEN }}
217224

218225
Publish:
219226
needs: [Build]

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<Choose>
3030
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
3131
<PropertyGroup>
32-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
32+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
3333
</PropertyGroup>
3434
</When>
3535
<Otherwise>

tests/ImageSharp.Drawing.Benchmarks/ImageSharp.Drawing.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Choose>
2020
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
2121
<PropertyGroup>
22-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
22+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
2323
</PropertyGroup>
2424
</When>
2525
<Otherwise>

tests/ImageSharp.Drawing.Tests/ImageSharp.Drawing.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Choose>
1414
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
1515
<PropertyGroup>
16-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
16+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
1717
</PropertyGroup>
1818
</When>
1919
<Otherwise>

0 commit comments

Comments
 (0)