Skip to content

Sync eng/common directory with azure-sdk-tools for PR 12396 #3140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+21 −10
Open

Sync eng/common directory with azure-sdk-tools for PR 12396 #3140

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0361c39
Secure tsp-client usage by using pinned version from package-lock.json
Copilot Oct 7, 2025
08e6ac1
Use absolute path and remove try/finally blocks
Copilot Oct 7, 2025
10ee682
Keep original workingDirectory and use Push-Location for directory sw…
Copilot Oct 7, 2025
04cc1e0
Resolve EmitterPackageJsonOutputPath to absolute path if relative
Copilot Oct 7, 2025
3d07d9f
Use workingDirectory instead of Push-Location/Pop-Location
Copilot Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions eng/common/pipelines/templates/archetype-typespec-emitter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,27 +259,38 @@ extends:
displayName: Download pipeline artifacts

- pwsh: |
npm install -g @azure-tools/typespec-client-generator-cli@latest
npm ci
displayName: Install tsp-client
workingDirectory: $(Build.SourcesDirectory)/eng/common/tsp-client

- pwsh: |
# Resolve EmitterPackageJsonOutputPath to absolute path if it's relative
$emitterPath = '${{ parameters.EmitterPackageJsonOutputPath }}'
if (-not [System.IO.Path]::IsPathRooted($emitterPath)) {
$emitterPath = Join-Path '$(Build.SourcesDirectory)' $emitterPath
}
Write-Host "##vso[task.setvariable variable=ResolvedEmitterPath]$emitterPath"
displayName: Resolve emitter package path
workingDirectory: $(Build.SourcesDirectory)

- pwsh: |
Write-Host "Overrides location: $(buildArtifactsPath)/packages/overrides.json"
Write-Host "Resolved emitter package path: $(ResolvedEmitterPath)"

if (Test-Path -Path '$(buildArtifactsPath)/packages/overrides.json') {
Write-Host "Using overrides.json to generate emitter-package.json"
tsp-client generate-config-files `
--package-json '$(buildArtifactsPath)/lock-files/package.json' `
--emitter-package-json-path '${{ parameters.EmitterPackageJsonOutputPath }}' `
--overrides '$(buildArtifactsPath)/packages/overrides.json'
npm exec --no -- tsp-client generate-config-files `
--package-json '$(buildArtifactsPath)/lock-files/package.json' `
--emitter-package-json-path '$(ResolvedEmitterPath)' `
--overrides '$(buildArtifactsPath)/packages/overrides.json'
} else {
Write-Host "No overrides.json found. Running tsp-client without overrides."

tsp-client generate-config-files `
--package-json '$(buildArtifactsPath)/lock-files/package.json' `
--emitter-package-json-path '${{ parameters.EmitterPackageJsonOutputPath }}'
npm exec --no -- tsp-client generate-config-files `
--package-json '$(buildArtifactsPath)/lock-files/package.json' `
--emitter-package-json-path '$(ResolvedEmitterPath)'
}
displayName: Generate emitter-package.json and emitter-package-lock files
workingDirectory: $(Build.SourcesDirectory)
workingDirectory: $(Build.SourcesDirectory)/eng/common/tsp-client

- ${{ parameters.InitializationSteps }}

Expand Down