Skip to content

Commit 3bfbbb2

Browse files
azure-sdkraych1
andauthored
Sync eng/common directory with azure-sdk-tools for PR 6305 (#20996)
* Added switch to skip sync and generate script call * output switch * support forked spec repo in regex --------- Co-authored-by: raychen <[email protected]>
1 parent bf033de commit 3bfbbb2

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

eng/common/scripts/TypeSpec-Project-Process.ps1

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ param (
88
[Parameter(Position = 1)]
99
[string] $CommitHash,
1010
[Parameter(Position = 2)]
11-
[string] $RepoUrl
11+
[string] $RepoUrl,
12+
[switch] $SkipSyncAndGenerate
1213
)
1314

1415
. $PSScriptRoot/common.ps1
@@ -111,7 +112,7 @@ $specRepoRoot = ""
111112
$generateFromLocalTypeSpec = $false
112113
# remote url scenario
113114
# example url of tspconfig.yaml: https://github.com/Azure/azure-rest-api-specs-pr/blob/724ccc4d7ef7655c0b4d5c5ac4a5513f19bbef35/specification/containerservice/Fleet.Management/tspconfig.yaml
114-
if ($TypeSpecProjectDirectory -match '^https://github.com/(?<repo>Azure/azure-rest-api-specs(-pr)?)/blob/(?<commit>[0-9a-f]{40})/(?<path>.*)/tspconfig.yaml$') {
115+
if ($TypeSpecProjectDirectory -match '^https://github.com/(?<repo>[^/]*/azure-rest-api-specs(-pr)?)/blob/(?<commit>[0-9a-f]{40})/(?<path>.*)/tspconfig.yaml$') {
115116
try {
116117
$TypeSpecProjectDirectory = $TypeSpecProjectDirectory -replace "https://github.com/(.*)/(tree|blob)", "https://raw.githubusercontent.com/`$1"
117118
Invoke-WebRequest $TypeSpecProjectDirectory -OutFile $tspConfigPath -MaximumRetryCount 3
@@ -199,14 +200,19 @@ if ($generateFromLocalTypeSpec) {
199200
$sdkProjectFolder = CreateUpdate-TspLocation $tspConfigYaml $TypeSpecProjectDirectory $CommitHash $repo $sdkRepoRootPath
200201
}
201202

202-
# call TypeSpec-Project-Sync.ps1
203-
$syncScript = Join-Path $PSScriptRoot TypeSpec-Project-Sync.ps1
204-
& $syncScript $sdkProjectFolder $specRepoRoot
205-
if ($LASTEXITCODE) { exit $LASTEXITCODE }
206-
207-
# call TypeSpec-Project-Generate.ps1
208-
$generateScript = Join-Path $PSScriptRoot TypeSpec-Project-Generate.ps1
209-
& $generateScript $sdkProjectFolder
210-
if ($LASTEXITCODE) { exit $LASTEXITCODE }
203+
# checking skip switch
204+
if ($SkipSyncAndGenerate) {
205+
Write-Host "Skip calling TypeSpec-Project-Sync.ps1 and TypeSpec-Project-Generate.ps1."
206+
} else {
207+
# call TypeSpec-Project-Sync.ps1
208+
$syncScript = Join-Path $PSScriptRoot TypeSpec-Project-Sync.ps1
209+
& $syncScript $sdkProjectFolder $specRepoRoot
210+
if ($LASTEXITCODE) { exit $LASTEXITCODE }
211+
212+
# call TypeSpec-Project-Generate.ps1
213+
$generateScript = Join-Path $PSScriptRoot TypeSpec-Project-Generate.ps1
214+
& $generateScript $sdkProjectFolder
215+
if ($LASTEXITCODE) { exit $LASTEXITCODE }
216+
}
211217

212218
return $sdkProjectFolder

0 commit comments

Comments
 (0)