Skip to content

Commit 3432d83

Browse files
committed
ci: another attempt at fixing script path
Signed-off-by: Vincent Biret <[email protected]>
1 parent bb48fef commit 3432d83

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.azure-pipelines/generation-templates/capture-metadata.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ parameters:
3030
default: 'tsp-output'
3131
- name: metadataAnnotationsCopyScriptPath
3232
type: string
33-
default: $[format('{0}/../scripts/copy-annotations-to-csdl.ps1', parameters['metadataTypeSpecAnnotationsSource'])]
33+
default: '/../scripts/copy-annotations-to-csdl.ps1'
3434
- name: sanitizedEndpoint
3535
type: string
3636
default: $[replace(parameters['endpoint'], '/', ''))]
@@ -99,7 +99,7 @@ steps:
9999
endpointVersion: ${{ parameters.endpoint }}
100100
displayName: 'run Typewriter to clean ${{ parameters.endpoint }} metadata'
101101

102-
- pwsh: '. $Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_${{ parameters.sanitizedEndpoint }}_metadata/cleanMetadataWithDescriptions${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
102+
- pwsh: '. $(metadataTypeSpecAnnotationsSource)/$Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_${{ parameters.sanitizedEndpoint }}_metadata/cleanMetadataWithDescriptions${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
103103
env:
104104
ScriptPath: ${{ parameters.metadataAnnotationsCopyScriptPath }}
105105

@@ -118,7 +118,7 @@ steps:
118118
OutputMetadataFileName: 'cleanMetadataWithDescriptionsAndAnnotations'
119119
displayName: 'run Typewriter to clean ${{ parameters.endpoint }} metadata and keep capability annotations'
120120

121-
- pwsh: '. $Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotations${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
121+
- pwsh: '. $(metadataTypeSpecAnnotationsSource)/$Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotations${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
122122
env:
123123
ScriptPath: ${{ parameters.metadataAnnotationsCopyScriptPath }}
124124

@@ -138,7 +138,7 @@ steps:
138138
OutputMetadataFileName: 'cleanMetadataWithDescriptionsAndAnnotationsAndErrors'
139139
displayName: 'run Typewriter to clean ${{ parameters.endpoint }} metadata and keep capability annotations and include error information'
140140

141-
- pwsh: '. $Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotationsAndErrors${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
141+
- pwsh: '. $(metadataTypeSpecAnnotationsSource)/$Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotationsAndErrors${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
142142
env:
143143
ScriptPath: ${{ parameters.metadataAnnotationsCopyScriptPath }}
144144

0 commit comments

Comments
 (0)