Skip to content

Commit e2c950f

Browse files
committed
feat(ci): update GitVersion and package versions
- Upgraded GitVersion configuration to version 6.x. - Updated package versions for ES.FX.Ignite and related packages to 9.1.30 to ensure compatibility and incorporate recent improvements. - Adjusted GitVersion settings for better branch labeling and pre-release management.
1 parent 0427081 commit e2c950f

File tree

3 files changed

+39
-32
lines changed

3 files changed

+39
-32
lines changed

.github/workflows/pipeline.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,13 @@ jobs:
6464
- name: tools - gitversion - install
6565
uses: gittools/actions/gitversion/setup@v4.0.0
6666
with:
67-
versionSpec: "5.x"
67+
versionSpec: "6.x"
6868
preferLatestVersion: true
6969

7070
- name: gitversion - execute
7171
id: gitversion
7272
uses: gittools/actions/gitversion/execute@v4.0.0
7373
with:
74-
useConfigFile: true
7574
configFilePath: GitVersion.yaml
7675

7776
- name: tools - detect changes

Directory.Packages.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
8-
<PackageVersion Include="ES.FX.Ignite" Version="9.1.29" />
9-
<PackageVersion Include="ES.FX.Ignite.KubernetesClient" Version="9.1.29" />
10-
<PackageVersion Include="ES.FX.Ignite.OpenTelemetry.Exporter.Seq" Version="9.1.29" />
11-
<PackageVersion Include="ES.FX.Ignite.Serilog" Version="9.1.29" />
12-
<PackageVersion Include="ES.FX.Additions.Newtonsoft.Json" Version="9.1.29" />
13-
<PackageVersion Include="ES.FX.Additions.KubernetesClient" Version="9.1.29" />
8+
<PackageVersion Include="ES.FX.Ignite" Version="9.1.30" />
9+
<PackageVersion Include="ES.FX.Ignite.KubernetesClient" Version="9.1.30" />
10+
<PackageVersion Include="ES.FX.Ignite.OpenTelemetry.Exporter.Seq" Version="9.1.30" />
11+
<PackageVersion Include="ES.FX.Ignite.Serilog" Version="9.1.30" />
12+
<PackageVersion Include="ES.FX.Additions.Newtonsoft.Json" Version="9.1.30" />
13+
<PackageVersion Include="ES.FX.Additions.KubernetesClient" Version="9.1.30" />
1414
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
1515
<PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.6" />
1616
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.6" />

GitVersion.yaml

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,44 @@ assembly-versioning-scheme: MajorMinorPatch
22
assembly-file-versioning-scheme: MajorMinorPatch
33
mode: ContinuousDelivery
44
tag-prefix: '[vV]'
5-
continuous-delivery-fallback-tag: ci
65
major-version-bump-message: '\+semver:\s?(breaking|major)'
76
minor-version-bump-message: '\+semver:\s?(feature|minor)'
87
patch-version-bump-message: '\+semver:\s?(fix|patch)'
98
no-bump-message: '\+semver:\s?(none|skip)'
10-
legacy-semver-padding: 4
11-
build-metadata-padding: 4
12-
commits-since-version-source-padding: 4
139
tag-pre-release-weight: 60000
1410
commit-message-incrementing: Enabled
11+
1512
branches:
1613
develop:
1714
mode: ContinuousDeployment
18-
tag: develop
15+
label: develop
1916
increment: Minor
20-
prevent-increment-of-merged-branch-version: false
2117
track-merge-target: true
2218
regex: ^dev(elop)?(ment)?$
2319
source-branches: []
2420
tracks-release-branches: true
2521
is-release-branch: false
26-
is-mainline: false
22+
is-main-branch: false
2723
pre-release-weight: 0
24+
2825
main:
29-
mode: ContinuousDelivery
30-
tag: ''
26+
mode: ContinuousDeployment
27+
label: ''
3128
increment: Patch
32-
prevent-increment-of-merged-branch-version: true
3329
track-merge-target: false
3430
regex: ^master$|^main$
3531
source-branches:
3632
- develop
3733
- release
3834
tracks-release-branches: false
39-
is-release-branch: false
40-
is-mainline: true
35+
is-release-branch: true
36+
is-main-branch: true
4137
pre-release-weight: 55000
38+
4239
release:
4340
mode: ContinuousDelivery
44-
tag: rc
41+
label: rc
4542
increment: None
46-
prevent-increment-of-merged-branch-version: true
4743
track-merge-target: false
4844
regex: ^releases?[/-]
4945
source-branches:
@@ -53,11 +49,21 @@ branches:
5349
- release
5450
tracks-release-branches: false
5551
is-release-branch: true
56-
is-mainline: false
52+
is-main-branch: false
5753
pre-release-weight: 30000
54+
55+
dependabot:
56+
regex: '^dependabot/.*'
57+
mode: ContinuousDelivery
58+
label: 'dependabot'
59+
increment: Patch
60+
track-merge-target: false
61+
source-branches: [ main, develop ]
62+
pre-release-weight: 20000
63+
5864
feature:
5965
mode: ContinuousDelivery
60-
tag: '{BranchName}'
66+
label: '{BranchName}'
6167
increment: Inherit
6268
regex: ^features?[/-]
6369
source-branches:
@@ -68,11 +74,11 @@ branches:
6874
- support
6975
- hotfix
7076
pre-release-weight: 30000
77+
7178
pull-request:
7279
mode: ContinuousDelivery
73-
tag: PullRequest
80+
label: PullRequest
7481
increment: Inherit
75-
tag-number-pattern: '[/-](?<number>\d+)'
7682
regex: ^(pull|pull\-requests|pr)[/-]
7783
source-branches:
7884
- develop
@@ -82,11 +88,11 @@ branches:
8288
- support
8389
- hotfix
8490
pre-release-weight: 30000
91+
8592
hotfix:
8693
mode: ContinuousDelivery
87-
tag: hotfix
94+
label: hotfix
8895
increment: Patch
89-
prevent-increment-of-merged-branch-version: false
9096
track-merge-target: false
9197
regex: ^hotfix(es)?[/-]
9298
source-branches:
@@ -96,23 +102,25 @@ branches:
96102
- hotfix
97103
tracks-release-branches: false
98104
is-release-branch: false
99-
is-mainline: false
105+
is-main-branch: false
100106
pre-release-weight: 30000
107+
101108
support:
102109
mode: ContinuousDelivery
103-
tag: ''
110+
label: ''
104111
increment: Patch
105-
prevent-increment-of-merged-branch-version: true
106112
track-merge-target: false
107113
regex: ^support[/-]
108114
source-branches:
109115
- main
110116
tracks-release-branches: false
111117
is-release-branch: false
112-
is-mainline: true
118+
is-main-branch: true
113119
pre-release-weight: 55000
120+
114121
ignore:
115122
sha: []
123+
116124
increment: Inherit
117125
commit-date-format: yyyy-MM-dd
118126
merge-message-formats: {}

0 commit comments

Comments
 (0)