Skip to content

Commit ea766fd

Browse files
Try matching build process with ImageSharp
1 parent b976617 commit ea766fd

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ on:
44
push:
55
branches:
66
- main
7+
- release/*
78
tags:
89
- "v*"
910
pull_request:
1011
branches:
1112
- main
13+
- release/*
1214
types: [ labeled, opened, synchronize, reopened ]
15+
1316
jobs:
1417
# Prime a single LFS cache and expose the exact key for the matrix
1518
WarmLFS:
@@ -112,14 +115,14 @@ jobs:
112115
options:
113116
os: buildjet-4vcpu-ubuntu-2204-arm
114117

115-
runs-on: ${{matrix.options.os}}
118+
runs-on: ${{ matrix.options.os }}
116119

117120
steps:
118121
- name: Install libgdi+, which is required for tests running on ubuntu
119122
if: ${{ contains(matrix.options.os, 'ubuntu') }}
120123
run: |
121-
sudo apt-get update
122-
sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
124+
sudo apt-get update
125+
sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
123126
124127
- name: Git Config
125128
shell: bash
@@ -141,6 +144,7 @@ jobs:
141144
key: ${{ needs.WarmLFS.outputs.lfs_key }}
142145

143146
- name: Git Pull LFS
147+
shell: bash
144148
run: git lfs pull
145149

146150
- name: NuGet Install
@@ -211,14 +215,10 @@ jobs:
211215
with:
212216
flags: unittests
213217

214-
215218
Publish:
216219
needs: [Build]
217-
218220
runs-on: ubuntu-latest
219-
220221
if: (github.event_name == 'push')
221-
222222
steps:
223223
- name: Git Config
224224
shell: bash
@@ -259,4 +259,3 @@ jobs:
259259
run: |
260260
dotnet nuget push .\artifacts\*.nupkg -k ${{secrets.NUGET_TOKEN}} -s https://api.nuget.org/v3/index.json --skip-duplicate
261261
dotnet nuget push .\artifacts\*.snupkg -k ${{secrets.NUGET_TOKEN}} -s https://api.nuget.org/v3/index.json --skip-duplicate
262-

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<!--Mark members as static-->
1414
<NoWarn>CA1822</NoWarn>
1515
</PropertyGroup>
16-
16+
1717
<Choose>
1818
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
1919
<PropertyGroup>

0 commit comments

Comments
 (0)