Skip to content

Commit cc84c13

Browse files
committed
fix: Fix GitVersion pre-release numbering for pre-release/upstream and switch release tags/assets to use semVer instead of nuGetVersionV2.
1 parent 5bd8af4 commit cc84c13

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
8484
- name: Create output zip file
8585
run: |
86-
$version = "${{ steps.gitversion.outputs.nuGetVersionV2 }}"
86+
$version = "${{ steps.gitversion.outputs.semVer }}"
8787
$outputDir = "src/OTAPI.UnifiedServerProcess/bin/Release/net9.0/output"
8888
$zipPath = "UnifiedServerProcess-v$version.zip"
8989
Compress-Archive -Path "$outputDir\*" -DestinationPath "$zipPath"
@@ -95,8 +95,8 @@ jobs:
9595
env:
9696
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9797
with:
98-
tag_name: v${{ steps.gitversion.outputs.nuGetVersionV2 }}
99-
release_name: Release v${{ steps.gitversion.outputs.nuGetVersionV2 }}
98+
tag_name: v${{ steps.gitversion.outputs.semVer }}
99+
release_name: Release v${{ steps.gitversion.outputs.semVer }}
100100
draft: false
101101
prerelease: ${{ github.ref == 'refs/heads/pre-release/upstream' }}
102102

@@ -106,6 +106,6 @@ jobs:
106106
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
107107
with:
108108
upload_url: ${{ steps.create_release.outputs.upload_url }}
109-
asset_path: ./UnifiedServerProcess-v${{ steps.gitversion.outputs.nuGetVersionV2 }}.zip
110-
asset_name: UnifiedServerProcess-v${{ steps.gitversion.outputs.nuGetVersionV2 }}.zip
109+
asset_path: ./UnifiedServerProcess-v${{ steps.gitversion.outputs.semVer }}.zip
110+
asset_name: UnifiedServerProcess-v${{ steps.gitversion.outputs.semVer }}.zip
111111
asset_content_type: application/zip

GitVersion.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
next-version: 1.0.3
2-
# mode: ContinuousDeployment
32
branches:
43
main:
54
increment: Patch
65
prevent-increment-of-merged-branch-version: true
76
track-merge-target: false
7+
pre_release_upstream:
8+
regex: ^pre-release/upstream$
9+
mode: ContinuousDeployment
10+
tag: pre-release-upstream
11+
increment: Patch
12+
prevent-increment-of-merged-branch-version: true
13+
track-merge-target: false
14+
source-branches: [ main ]
815
ignore:
916
sha: []

0 commit comments

Comments
 (0)