Skip to content

Commit 4b0d144

Browse files
committed
make sure we get version from package.json
1 parent 32ae290 commit 4b0d144

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

build/templates/publish-extension.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ parameters:
110110

111111
jobs:
112112
# Job 1: Sign extension and create GitHub release
113-
- job: Sign
113+
- job: Sign and GitHubRelease
114114
displayName: Sign Extension and Create GitHub Release
115115
pool:
116116
name: VSEngSS-MicroBuild2022-1ES
@@ -169,7 +169,7 @@ jobs:
169169
$package = Get-Content $packageJsonPath -Raw | ConvertFrom-Json
170170
Write-Host "##vso[task.setvariable variable=publisher;isOutput=true]$($package.publisher)"
171171
Write-Host "##vso[task.setvariable variable=version;isOutput=true]$($package.version)"
172-
name: GetVersion
172+
name: SetPublisherAndVersion
173173
displayName: 📋 Get Publisher & Version
174174
workingDirectory: $(Agent.TempDirectory)/vsix-extracted
175175
@@ -187,30 +187,14 @@ jobs:
187187
parameters:
188188
isPreRelease: ${{ parameters.preRelease }}
189189
ghReleaseAddChangeLog: ${{ parameters.ghReleaseAddChangeLog }}
190-
tagName: ${{ parameters.ghTagPrefix }}$(GetVersion.version)
190+
tagName: ${{ parameters.ghTagPrefix }}$(SetPublisherAndVersion.version)
191191

192-
# Job 2: Wait for manual validation (optional)
193-
- ${{ if and(eq(parameters.waitForValidation, true), eq(parameters.publishExtension, true)) }}:
194-
- job: WaitForValidation
195-
displayName: Wait for manual validation
196-
dependsOn: Sign
197-
pool: server
198-
steps:
199-
- task: ManualValidation@0
200-
timeoutInMinutes: ${{ parameters.validationTimeoutInMinutes }}
201-
inputs:
202-
notifyUsers: '${{ parameters.validationNotifyUsers }}'
203-
instructions: '${{ parameters.validationInstructions }}'
204-
onTimeout: 'reject'
205192

206193
# Job 3: Publish to marketplace
207194
- ${{ if eq(parameters.publishExtension, true) }}:
208195
- job: Publish
209196
displayName: Publish to Marketplace
210-
${{ if eq(parameters.waitForValidation, true) }}:
211-
dependsOn: WaitForValidation
212-
${{ else }}:
213-
dependsOn: Sign
197+
dependsOn: Sign
214198
pool:
215199
name: VSEngSS-MicroBuild2022-1ES
216200
os: windows

0 commit comments

Comments
 (0)