diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 97569bd..502647d 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -24,11 +24,13 @@ jobs: dotnet-version: 6.0.x - name: Install GitVersion - run: dotnet tool install --global GitVersion.Tool - + uses: gittools/actions/gitversion/setup@v3.0.0 + with: + versionSpec: '6.x' + - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.15 + uses: gittools/actions/gitversion/execute@v3.0.0 with: useConfigFile: true diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 30c72ba..8995886 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -23,13 +23,15 @@ jobs: dotnet-version: 6.0.x - name: Install GitVersion - run: dotnet tool install --global GitVersion.Tool - + uses: gittools/actions/gitversion/setup@v3.0.0 + with: + versionSpec: '6.x' + - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.15 + uses: gittools/actions/gitversion/execute@v3.0.0 with: - useConfigFile: true + useConfigFile: true 15 - name: Restore Packages run: dotnet restore "${{ env.solution-path }}" diff --git a/GitVersion.yml b/GitVersion.yml index a59d151..b38944b 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -3,15 +3,18 @@ next-version: 5.1.4 branches: develop: regex: develop - tag: 'alpha' + label: 'alpha' increment: Patch + prevent-increment: + when-current-commit-tagged: true source-branches: [] pull-request: regex: (pull|pull\-requests|pr)[/-] - tag: 'pr' - tag-number-pattern: '[/-](?\d+)[-/]' + label: 'pr' + label-number-pattern: '[/-](?\d+)[-/]' increment: Patch - prevent-increment-of-merged-branch-version: false + prevent-increment: + when-current-commit-tagged: true is-release-branch: false source-branches: [] ignore: