From d86acd824b8c8621c0cf1c07090e4d1299413fa9 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Fri, 14 Feb 2025 20:09:07 +0800 Subject: [PATCH 1/4] output modified modules --- tools/BuildScripts/BuildModules.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/BuildScripts/BuildModules.ps1 b/tools/BuildScripts/BuildModules.ps1 index 3c2396b0cd09..4dc295cfc64b 100644 --- a/tools/BuildScripts/BuildModules.ps1 +++ b/tools/BuildScripts/BuildModules.ps1 @@ -127,6 +127,10 @@ $prepareScriptPath = Join-Path $toolDirectory 'BuildScripts' 'PrepareAutorestMod $isInvokedByPipeline = $false if ($InvokedByPipeline) { $isInvokedByPipeline = $true + if ($ModifiedModule) { + $outputModifiedPath = Join-Path $RepoArtifacts "ModifiedModule.txt" + $TargetModule | Out-File -Path $outputModifiedPath -Force + } } foreach ($moduleRootName in $TargetModule) { Write-Host "Preparing $moduleRootName ..." -ForegroundColor DarkGreen From 271b315e3d4cf4c4334f6bf88e41ef8da8bb0b53 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Fri, 14 Feb 2025 20:37:31 +0800 Subject: [PATCH 2/4] output target modules instead --- tools/BuildScripts/BuildModules.ps1 | 6 ++---- tools/ExpandModules.ps1 | 18 +++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/tools/BuildScripts/BuildModules.ps1 b/tools/BuildScripts/BuildModules.ps1 index 4dc295cfc64b..e680d89e7182 100644 --- a/tools/BuildScripts/BuildModules.ps1 +++ b/tools/BuildScripts/BuildModules.ps1 @@ -127,10 +127,8 @@ $prepareScriptPath = Join-Path $toolDirectory 'BuildScripts' 'PrepareAutorestMod $isInvokedByPipeline = $false if ($InvokedByPipeline) { $isInvokedByPipeline = $true - if ($ModifiedModule) { - $outputModifiedPath = Join-Path $RepoArtifacts "ModifiedModule.txt" - $TargetModule | Out-File -Path $outputModifiedPath -Force - } + $outputModifiedPath = Join-Path $RepoArtifacts "TargetModule.txt" + $TargetModule | Out-File -Path $outputModifiedPath -Force } foreach ($moduleRootName in $TargetModule) { Write-Host "Preparing $moduleRootName ..." -ForegroundColor DarkGreen diff --git a/tools/ExpandModules.ps1 b/tools/ExpandModules.ps1 index c94eabfc2a37..d02a9e024f84 100644 --- a/tools/ExpandModules.ps1 +++ b/tools/ExpandModules.ps1 @@ -33,21 +33,21 @@ if ([string]::IsNullOrEmpty($Artifacts)) { New-Item -Path (Get-Item $Artifacts).FullName -Name "tmp" -ItemType "directory" $tmp = Join-Path -Path (Get-Item $Artifacts).FullName -ChildPath "tmp" -$ModifiedModulesPath = Join-Path $Artifacts -ChildPath "ModifiedModule.txt" -$ModifiedModules = @() -if (Test-Path $ModifiedModulesPath) { - $ModifiedModules = Get-Content $ModifiedModulesPath +$TargetModulePath = Join-Path $Artifacts -ChildPath "TargetModule.txt" +$TargetModule = @() +if (Test-Path $TargetModulePath) { + $TargetModule = Get-Content $TargetModulePath } -Write-Host $ModifiedModules +Write-Host $TargetModule try { $AllPackages = Get-ChildItem -Path $Artifacts -Filter "*.nupkg" - if ($ModifiedModules.Length -eq 0) { - Write-Host "ModifiedModule.txt not finded, default expand all modules." - $ModifiedModules = $AllPackages.Name + if ($TargetModule.Length -eq 0) { + Write-Error "No target modules found." + exit 1 } foreach ($package in $AllPackages) { - foreach ($module in $ModifiedModules) { + foreach ($module in $TargetModule) { if (($package.Name -like "Az.$module.*.nupkg") -or ($package.Name -match '^Az(Preview)?\.\d+\.\d+\.\d+\.nupkg$')) { $module_name = $package.Name $zip_artifact = $package.FullName -replace ".nupkg$",".zip" From ec5a3d62f5868bfff892ed2571bd25d07e6ca2e7 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Fri, 14 Feb 2025 20:51:41 +0800 Subject: [PATCH 3/4] fix --- tools/BuildScripts/BuildModules.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/BuildScripts/BuildModules.ps1 b/tools/BuildScripts/BuildModules.ps1 index e680d89e7182..817bfc194456 100644 --- a/tools/BuildScripts/BuildModules.ps1 +++ b/tools/BuildScripts/BuildModules.ps1 @@ -127,8 +127,9 @@ $prepareScriptPath = Join-Path $toolDirectory 'BuildScripts' 'PrepareAutorestMod $isInvokedByPipeline = $false if ($InvokedByPipeline) { $isInvokedByPipeline = $true - $outputModifiedPath = Join-Path $RepoArtifacts "TargetModule.txt" - $TargetModule | Out-File -Path $outputModifiedPath -Force + $outputTargetPath = Join-Path $RepoArtifacts "TargetModule.txt" + New-Item -Path $outputTargetPath -Force + $TargetModule | Out-File -Path $outputTargetPath -Force } foreach ($moduleRootName in $TargetModule) { Write-Host "Preparing $moduleRootName ..." -ForegroundColor DarkGreen From 5a00805fba1fcd438944da1911d976d2ac3b5278 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Fri, 14 Feb 2025 22:39:13 +0800 Subject: [PATCH 4/4] try lowercases artifacts --- tools/BuildScripts/BuildModules.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/BuildScripts/BuildModules.ps1 b/tools/BuildScripts/BuildModules.ps1 index 817bfc194456..7420ed6535ca 100644 --- a/tools/BuildScripts/BuildModules.ps1 +++ b/tools/BuildScripts/BuildModules.ps1 @@ -38,7 +38,7 @@ if (($null -eq $RepoRoot) -or (0 -eq $RepoRoot.Length)) { $notModules = @('lib', 'shared', 'helpers') $coreTestModule = @('Compute', 'Network', 'Resources', 'Sql', 'Websites') -$RepoArtifacts = Join-Path $RepoRoot "Artifacts" +$RepoArtifacts = Join-Path $RepoRoot "artifacts" $csprojFiles = @() $testModule = @()