Skip to content

Commit db61070

Browse files
Merge pull request #63 from IowaComputerGurus/bug/gitversion-yaml
Fix: updated GitVersion.yml
2 parents ab87e2f + 0a63d48 commit db61070

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/workflows/ci-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install GitVersion
2727
uses: gittools/actions/gitversion/setup@v3.0.2
2828
with:
29-
versionSpec: '6.x'
29+
versionSpec: '6.0.5'
3030

3131
- name: Determine Version
3232
id: gitversion
@@ -83,7 +83,7 @@ jobs:
8383
- name: Install GitVersion
8484
uses: gittools/actions/gitversion/setup@v3.0.2
8585
with:
86-
versionSpec: '6.x'
86+
versionSpec: '6.0.5'
8787

8888
- name: Determine Version
8989
id: gitversion
@@ -101,4 +101,4 @@ jobs:
101101
dotnet restore "${{ env.solution-path }}"
102102
dotnet build "${{ env.solution-path }}" --no-restore --configuration Release -p:version=${{ steps.gitversion.outputs.majorMinorPatch }}
103103
dotnet test "${{ env.solution-path }}" --no-build --configuration Release --collect "XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover --logger "trx;LogFileName=unittests.trx"
104-
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
104+
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"

.github/workflows/release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install GitVersion
2626
uses: gittools/actions/gitversion/setup@v3.0.2
2727
with:
28-
versionSpec: '6.x'
28+
versionSpec: '6.0.5'
2929

3030
- name: Determine Version
3131
id: gitversion

GitVersion.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ branches:
88
prevent-increment:
99
when-current-commit-tagged: true
1010
source-branches: []
11+
hotfix:
12+
regex: hotfix[/-]
13+
source-branches: [develop]
14+
prevent-increment:
15+
when-current-commit-tagged: true
16+
is-release-branch: true
1117
pull-request:
1218
regex: (pull|pull\-requests|pr)[/-]
1319
label: 'pr'

0 commit comments

Comments
 (0)