Skip to content

Commit 3d012df

Browse files
authored
Merge pull request #61 from unoplatform/dev/jela/nbgv
ci: Move to nbgv
2 parents 633bdca + ae8b13b commit 3d012df

File tree

3 files changed

+40
-87
lines changed

3 files changed

+40
-87
lines changed

.github/workflows/ci.yml

+18-36
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,13 @@ jobs:
2929
- name: Setup .NET
3030
uses: actions/setup-dotnet@v1
3131
with:
32-
dotnet-version: '7.0.100'
32+
dotnet-version: '9.0.100'
3333

34-
- name: Setup GitVersion
35-
uses: gittools/actions/gitversion/[email protected]
34+
- uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
35+
id: nbgv
3636
with:
37-
versionSpec: '5.10.3'
38-
39-
- name: GitVersion
40-
id: gitversion
41-
uses: gittools/actions/gitversion/[email protected]
42-
with:
43-
useConfigFile: true
44-
configFilePath: build/gitversion.yml
37+
toolVersion: 3.6.139
38+
setAllVars: true
4539

4640
- name: Build Fluent Font
4741
run: |
@@ -54,7 +48,7 @@ jobs:
5448
5549
- name: Pack
5650
run: |
57-
$adjustedPackageVersion="${{ steps.gitversion.outputs.semVer }}".ToLower();
51+
$adjustedPackageVersion="${{ steps.nbgv.outputs.SemVer2 }}".ToLower();
5852
build/nuget.exe pack nuget/Fluent/Uno.Fonts.Fluent.nuspec -Version $adjustedPackageVersion -OutputDirectory ./artifacts
5953
6054
- name: Upload Fluent Artifacts # Changed to have unique name for artifacts
@@ -77,19 +71,13 @@ jobs:
7771
- name: Setup .NET
7872
uses: actions/setup-dotnet@v1
7973
with:
80-
dotnet-version: '7.0.100'
81-
82-
- name: Setup GitVersion
83-
uses: gittools/actions/gitversion/[email protected]
84-
with:
85-
versionSpec: '5.10.3'
74+
dotnet-version: '9.0.100'
8675

87-
- name: GitVersion
88-
id: gitversion
89-
uses: gittools/actions/gitversion/[email protected]
76+
- uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
77+
id: nbgv
9078
with:
91-
useConfigFile: true
92-
configFilePath: build/gitversion.yml
79+
toolVersion: 3.6.139
80+
setAllVars: true
9381

9482
- name: Install Windows SDK (${{ env.WIN_SDK_VERSION }})
9583
shell: pwsh
@@ -105,7 +93,7 @@ jobs:
10593
10694
- name: Pack Roboto Font
10795
run: |
108-
$adjustedPackageVersion="${{ steps.gitversion.outputs.semVer }}".ToLower();
96+
$adjustedPackageVersion="${{ steps.nbgv.outputs.SemVer2 }}".ToLower();
10997
msbuild nuget\Roboto\Uno.Fonts.Roboto\Uno.Fonts.Roboto.csproj -t:pack -p:Configuration=Release -p:PackageVersion=$adjustedPackageVersion -p:PackageOutputPath=artifacts
11098
11199
- name: Upload Roboto Artifacts # Changed to have unique name for artifacts
@@ -128,23 +116,17 @@ jobs:
128116
- name: Setup .NET
129117
uses: actions/setup-dotnet@v1
130118
with:
131-
dotnet-version: '7.0.100'
132-
133-
- name: Setup GitVersion
134-
uses: gittools/actions/gitversion/[email protected]
135-
with:
136-
versionSpec: '5.10.3'
119+
dotnet-version: '9.0.100'
137120

138-
- name: GitVersion
139-
id: gitversion
140-
uses: gittools/actions/gitversion/[email protected]
121+
- uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
122+
id: nbgv
141123
with:
142-
useConfigFile: true
143-
configFilePath: build/gitversion.yml
124+
toolVersion: 3.6.139
125+
setAllVars: true
144126

145127
- name: Pack OpenSans Font
146128
run: |
147-
$adjustedPackageVersion="${{ steps.gitversion.outputs.semVer }}".ToLower();
129+
$adjustedPackageVersion="${{ steps.nbgv.outputs.SemVer2 }}".ToLower();
148130
dotnet pack nuget\OpenSans\Uno.Fonts.OpenSans\Uno.Fonts.OpenSans.csproj -c Release -p:PackageVersion=$adjustedPackageVersion -p:PackageOutputPath=artifacts
149131
150132
- name: Upload OpenSans Artifacts # Changed to have unique name for artifacts

build/gitversion.yml

-51
This file was deleted.

version.json

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3+
"version": "2.6-dev.{height}",
4+
"versionHeightOffset": 86,
5+
"nuGetPackageVersion": {
6+
"semVer": 2.0
7+
},
8+
"publicReleaseRefSpec": [
9+
"^refs/heads/main$",
10+
"^refs/heads/release/stable/\\d+(?:\\.\\d+)?$"
11+
],
12+
"cloudBuild": {
13+
"setAllVariables": true,
14+
"buildNumber": {
15+
"enabled": true
16+
}
17+
},
18+
"release": {
19+
"branchName": "release/stable/{version}",
20+
"firstUnstableTag": "dev"
21+
}
22+
}

0 commit comments

Comments
 (0)