From 2ffa9e77dddb55a64af39f9dd9eb8d8af2491ecb Mon Sep 17 00:00:00 2001 From: Nihal R Date: Fri, 10 Jan 2025 15:24:45 +0530 Subject: [PATCH 1/3] Fix: updated GitVersion.yml file as per requirement --- GitVersion.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/GitVersion.yml b/GitVersion.yml index bba7c31..24ee234 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -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' From 688d9c86560ce1c8925c44ae95c4c13ed589367c Mon Sep 17 00:00:00 2001 From: Nihal R Date: Wed, 15 Jan 2025 13:52:16 +0530 Subject: [PATCH 2/3] Version corrected --- .github/workflows/ci-build.yml | 2 +- .github/workflows/release-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index bda20b5..94fbb59 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -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 diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 9742e0d..3baafad 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -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 From 0a63d4894048d4bd3986e9764c1fd1c9ef92d8fc Mon Sep 17 00:00:00 2001 From: Sumesh PU <138670853+sumesh-pu-swg@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:34:45 +0530 Subject: [PATCH 3/3] Update ci-build.yml --- .github/workflows/ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 94fbb59..3a7ee5f 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -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 @@ -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 }}" \ No newline at end of file + .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"