Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v3.0.2
with:
versionSpec: '6.x'
versionSpec: '6.0.5'

- name: Determine Version
id: gitversion
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v3.0.2
with:
versionSpec: '6.x'
versionSpec: '6.0.5'

- name: Determine Version
id: gitversion
Expand All @@ -101,4 +101,4 @@ jobs:
dotnet restore "${{ env.solution-path }}"
dotnet build "${{ env.solution-path }}" --no-restore --configuration Release -p:version=${{ steps.gitversion.outputs.majorMinorPatch }}
dotnet test "${{ env.solution-path }}" --no-build --configuration Release --collect "XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover --logger "trx;LogFileName=unittests.trx"
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v3.0.2
with:
versionSpec: '6.x'
versionSpec: '6.0.5'

- name: Determine Version
id: gitversion
Expand Down
6 changes: 6 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ branches:
prevent-increment:
when-current-commit-tagged: true
source-branches: []
hotfix:
regex: hotfix[/-]
source-branches: [develop]
prevent-increment:
when-current-commit-tagged: true
is-release-branch: true
pull-request:
regex: (pull|pull\-requests|pr)[/-]
label: 'pr'
Expand Down
Loading