diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index c874e74..fa86a76 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -24,13 +24,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.10.2 + uses: gittools/actions/gitversion/execute@v3.0.0 with: - useConfigFile: true + useConfigFile: true - name: Restore Packages run: dotnet restore "${{ env.solution-path }}" diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 8db2b69..f01cef0 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -23,11 +23,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.10.2 + uses: gittools/actions/gitversion/execute@v3.0.0 with: useConfigFile: true diff --git a/GitVersion.yml b/GitVersion.yml index 8b402e5..faa602c 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -3,15 +3,16 @@ next-version: 7.0.0 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 is-release-branch: false source-branches: [] ignore: