Skip to content

Commit 11c094c

Browse files
Update build and repo config to match ImageSharp
1 parent 2bce803 commit 11c094c

File tree

12 files changed

+86
-129
lines changed

12 files changed

+86
-129
lines changed

.github/FUNDING.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
open_collective: imagesharp
1+
github: SixLabors
2+
open_collective: sixlabors

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

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
codecov: false
3030

3131
runs-on: ${{matrix.options.os}}
32+
if: "!contains(github.event.head_commit.message, '[skip ci]')"
3233

3334
steps:
3435
- uses: actions/checkout@v2
@@ -44,27 +45,10 @@ jobs:
4445
git fetch --prune --unshallow
4546
git submodule -q update --init --recursive
4647
47-
- name: Fetch Tags for GitVersion
48-
run: |
49-
git fetch --tags
50-
51-
- name: Fetch master for GitVersion
52-
if: github.ref != 'refs/heads/master'
53-
run: git branch --create-reflog master origin/master
54-
55-
- name: Install GitVersion
56-
uses: gittools/actions/[email protected]
57-
with:
58-
versionSpec: "5.1.x"
59-
60-
- name: Use GitVersion
61-
id: gitversion # step id used as reference for output values
62-
uses: gittools/actions/[email protected]
63-
6448
- name: Setup DotNet SDK
6549
uses: actions/setup-dotnet@v1
6650
with:
67-
dotnet-version: "3.1.101"
51+
dotnet-version: "3.1.x"
6852

6953
- name: Install Azurite Linux
7054
if: matrix.options.os == 'ubuntu-latest'
@@ -85,7 +69,7 @@ jobs:
8569
8670
- name: Build
8771
shell: pwsh
88-
run: ./ci-build.ps1 "${{steps.gitversion.outputs.nuGetVersion}}" "${{matrix.options.framework}}"
72+
run: ./ci-build.ps1 "${{matrix.options.framework}}"
8973

9074
- name: Test
9175
shell: pwsh
@@ -121,33 +105,18 @@ jobs:
121105
git fetch --prune --unshallow
122106
git submodule -q update --init --recursive
123107
124-
- name: Fetch Tags for GitVersion
125-
run: |
126-
git fetch --tags
127-
128-
- name: Fetch master for GitVersion
129-
if: github.ref != 'refs/heads/master'
130-
run: git branch --create-reflog master origin/master
131-
132-
- name: Install GitVersion
133-
uses: gittools/actions/[email protected]
134-
with:
135-
versionSpec: "5.1.x"
136-
137-
- name: Use GitVersion
138-
id: gitversion # step id used as reference for output values
139-
uses: gittools/actions/[email protected]
140-
141108
- name: Setup DotNet SDK
142109
uses: actions/setup-dotnet@v1
143110
with:
144-
dotnet-version: "3.1.101"
111+
dotnet-version: "3.1.x"
145112

146113
- name: Pack
147114
shell: pwsh
148-
run: ./ci-pack.ps1 "${{steps.gitversion.outputs.nuGetVersion}}"
115+
run: ./ci-pack.ps1
149116

150117
- name: Publish to MyGet
151118
shell: pwsh
152-
run: nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
119+
run: |
120+
nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
121+
nuget.exe push .\artifacts\*.snupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v3/index.json
153122
# TODO: If github.ref starts with 'refs/tags' then it was tag push and we can optionally push out package to nuget.org

Directory.Build.props

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<DebugType Condition="'$(codecov)' != ''">full</DebugType>
2525
<NullableContextOptions>disable</NullableContextOptions>
2626
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
27-
<SignAssembly>false</SignAssembly>
2827
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
2928
</PropertyGroup>
3029

@@ -67,6 +66,12 @@
6766
<VersionSuffix></VersionSuffix>
6867
</PropertyGroup>
6968

69+
<!--MinVer Properties for versioning-->
70+
<PropertyGroup>
71+
<MinVerTagPrefix>v</MinVerTagPrefix>
72+
<MinVerVerbosity>normal</MinVerVerbosity>
73+
</PropertyGroup>
74+
7075
<!-- Default settings that are otherwise undefined -->
7176
<PropertyGroup>
7277
<Copyright>Copyright © Six Labors</Copyright>

Directory.Build.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
2323

2424
<!--Src Dependencies-->
25-
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.0-rc0002" />
2625
<PackageReference Update="Azure.Storage.Blobs" Version="12.4.0" />
26+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
27+
<PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
28+
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.0" />
2729
</ItemGroup>
2830

2931
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">

GitVersion.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)