@@ -259,41 +259,27 @@ extends:
259
259
displayName : Download pipeline artifacts
260
260
261
261
- pwsh : |
262
- Push-Location eng/common/tsp-client
263
- try {
264
- npm ci
265
- } finally {
266
- Pop-Location
267
- }
262
+ npm ci
268
263
displayName: Install tsp-client
264
+ workingDirectory: $(Build.SourcesDirectory)/eng/common/tsp-client
269
265
270
266
- pwsh : |
271
267
Write-Host "Overrides location: $(buildArtifactsPath)/packages/overrides.json"
272
268
273
269
if (Test-Path -Path '$(buildArtifactsPath)/packages/overrides.json') {
274
270
Write-Host "Using overrides.json to generate emitter-package.json"
275
- Push-Location eng/common/tsp-client
276
- try {
277
- npm exec --no -- tsp-client generate-config-files `
271
+ npm exec --no -- tsp-client generate-config-files `
278
272
--package-json '$(buildArtifactsPath)/lock-files/package.json' `
279
273
--emitter-package-json-path '$(Build.SourcesDirectory)/${{ parameters.EmitterPackageJsonOutputPath }}' `
280
274
--overrides '$(buildArtifactsPath)/packages/overrides.json'
281
- } finally {
282
- Pop-Location
283
- }
284
275
} else {
285
276
Write-Host "No overrides.json found. Running tsp-client without overrides."
286
- Push-Location eng/common/tsp-client
287
- try {
288
- npm exec --no -- tsp-client generate-config-files `
277
+ npm exec --no -- tsp-client generate-config-files `
289
278
--package-json '$(buildArtifactsPath)/lock-files/package.json' `
290
279
--emitter-package-json-path '$(Build.SourcesDirectory)/${{ parameters.EmitterPackageJsonOutputPath }}'
291
- } finally {
292
- Pop-Location
293
- }
294
280
}
295
281
displayName: Generate emitter-package.json and emitter-package-lock files
296
- workingDirectory: $(Build.SourcesDirectory)
282
+ workingDirectory: $(Build.SourcesDirectory)/eng/common/tsp-client
297
283
298
284
- ${{ parameters.InitializationSteps }}
299
285
0 commit comments