Skip to content

Commit f3d651a

Browse files
Initialize versionTag for release pipeline (#150)
This commit resolves #145 and fixes generation of last tag for all pipeline stages.
1 parent fdcda30 commit f3d651a

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

build/azure-pipelines/build-product.yml

+12-19
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,24 @@ stages:
5151
pool:
5252
vmImage: $(imageName)
5353
steps:
54-
- task: PowerShell@2
55-
displayName: Set last tag to variable
56-
name: getVersion
57-
inputs:
58-
targetType: 'inline'
59-
script: |
60-
$VERSION_TAG = git describe --tags (git rev-list --tags --max-count=1)
61-
Write-Host("##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG")
62-
Write-Host($VERSION_TAG)
54+
- template: build-tag.yml
55+
- script: |
56+
echo $(getVersion.VERSION_TAG)
6357
- template: build-common.yml
6458
parameters:
6559
OS: $(os)
6660
Arch: $(arch)
6761
ArtifactName: $(artifact)
68-
VersionTag: $(VERSION_TAG)
62+
VersionTag: $(getVersion.VERSION_TAG)
6963

7064
- stage: CreatePackages
7165
displayName: Create packages to publish
7266
jobs:
7367
- job: Sign_and_pack
7468
pool:
7569
vmImage: 'windows-latest'
76-
variables:
77-
versionTag: $[ stageDependencies.Compile.Sqlcmd.outputs['getVersion.VERSION_TAG'] ]
7870
steps:
71+
- template: build-tag.yml
7972
- task: DownloadPipelineArtifact@2
8073
inputs:
8174
buildType: 'current'
@@ -139,15 +132,15 @@ stages:
139132
rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdWindowsAmd64\Sqlcmd.exe'
140133
includeRootFolder: false
141134
archiveType: 'zip'
142-
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-windows-x64.zip'
135+
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-windows-x64.zip'
143136

144137
- task: ArchiveFiles@2
145138
displayName: Zip Windows arm binary
146139
inputs:
147140
rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdWindowsArm\Sqlcmd.exe'
148141
includeRootFolder: false
149142
archiveType: 'zip'
150-
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-windows-arm.zip'
143+
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-windows-arm.zip'
151144

152145
- task: ArchiveFiles@2
153146
displayName: Tar Linux amd64 binary
@@ -156,7 +149,7 @@ stages:
156149
includeRootFolder: false
157150
archiveType: 'tar'
158151
tarCompression: 'bz2'
159-
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-linux-x64.tar.bz2'
152+
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-linux-x64.tar.bz2'
160153

161154
- task: ArchiveFiles@2
162155
displayName: Tar Darwin binary
@@ -165,7 +158,7 @@ stages:
165158
includeRootFolder: false
166159
archiveType: 'tar'
167160
tarCompression: 'bz2'
168-
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-darwin-x64.tar.bz2'
161+
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-darwin-x64.tar.bz2'
169162

170163
- task: ArchiveFiles@2
171164
displayName: Tar Linux arm64 binary
@@ -174,7 +167,7 @@ stages:
174167
includeRootFolder: false
175168
archiveType: 'tar'
176169
tarCompression: 'bz2'
177-
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-linux-arm64.tar.bz2'
170+
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-linux-arm64.tar.bz2'
178171

179172
- task: ArchiveFiles@2
180173
displayName: Tar Linux s390x binary
@@ -183,7 +176,7 @@ stages:
183176
includeRootFolder: false
184177
archiveType: 'tar'
185178
tarCompression: 'bz2'
186-
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(versionTag)-linux-s390x.tar.bz2'
179+
archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(getVersion.VERSION_TAG)-linux-s390x.tar.bz2'
187180

188181
- task: PublishPipelineArtifact@1
189182
displayName: 'Publish release archives'
@@ -199,6 +192,6 @@ stages:
199192
action: 'create'
200193
target: '$(Build.SourceVersion)'
201194
tagSource: 'userSpecifiedTag'
202-
tag: '$(versionTag)'
195+
tag: '$(getVersion.VERSION_TAG)'
203196
changeLogCompareToRelease: 'lastFullRelease'
204197
changeLogType: 'commitBased'

build/azure-pipelines/build-tag.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
steps:
3+
- task: PowerShell@2
4+
displayName: Set last tag to variable
5+
name: getVersion
6+
inputs:
7+
targetType: 'inline'
8+
script: |
9+
$VERSION_TAG = git describe --tags (git rev-list --tags --max-count=1)
10+
Write-Host("##vso[task.setvariable variable=VERSION_TAG;isoutput=true]$VERSION_TAG")
11+
Write-Host($VERSION_TAG)

0 commit comments

Comments
 (0)