diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-13 22:36:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-13 22:36:52 +0300 |
commit | 86397ec4d2d646ab4205c00531f9d3a051e226ec (patch) | |
tree | be19c79e53c26011c5a2acc78a27c55aa29ea8f4 | |
parent | 7a61c806bf208688fc628822cd310a3c79d964be (diff) |
[release/v7.3.0-rc.1] Remove XML files for min-size package (#18275)
Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
-rw-r--r-- | build.psm1 | 11 | ||||
-rw-r--r-- | tools/packaging/packaging.psm1 | 7 | ||||
-rw-r--r-- | tools/releaseBuild/azureDevOps/templates/windows-packaging.yml | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/build.psm1 b/build.psm1 index 819a657361..050440dd01 100644 --- a/build.psm1 +++ b/build.psm1 @@ -1602,14 +1602,14 @@ function Show-PSPesterError $description = $testFailure.description $name = $testFailure.name $message = $testFailure.failure.message - $StackTrace = $testFailure.failure."stack-trace" + $stack_trace = $testFailure.failure."stack-trace" } elseif ($PSCmdlet.ParameterSetName -eq 'object') { $description = $testFailureObject.Describe + '/' + $testFailureObject.Context $name = $testFailureObject.Name $message = $testFailureObject.FailureMessage - $StackTrace = $testFailureObject.StackTrace + $stack_trace = $testFailureObject.StackTrace } else { @@ -1621,7 +1621,7 @@ function Show-PSPesterError Write-Log -isError -message "message:" Write-Log -isError -message $message Write-Log -isError -message "stack-trace:" - Write-Log -isError -message $StackTrace + Write-Log -isError -message $stack_trace } @@ -1659,14 +1659,14 @@ function Test-XUnitTestResults $description = $failure.type $name = $failure.method $message = $failure.failure.message - $StackTrace = $failure.failure.'stack-trace' + $stack_trace = $failure.failure.'stack-trace' Write-Log -isError -message ("Description: " + $description) Write-Log -isError -message ("Name: " + $name) Write-Log -isError -message "message:" Write-Log -isError -message $message Write-Log -isError -message "stack-trace:" - Write-Log -isError -message $StackTrace + Write-Log -isError -message $stack_trace Write-Log -isError -message " " } @@ -2846,7 +2846,6 @@ assembly # only create an assembly group if we have tests if ( $tCases.count -eq 0 -and ! $includeEmpty ) { continue } $tGroup = $tCases | Group-Object result - $total = $tCases.Count $asm = [testassembly]::new() $asm.environment = $environment $asm."run-date" = $rundate diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 775270acab..d3484793a7 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -4587,7 +4587,6 @@ function Invoke-AzDevOpsLinuxPackageBuild { # Remove symbol files, xml document files. Remove-Item "${buildFolder}\*.pdb", "${buildFolder}\*.xml" -Force - ## Build 'linux-arm' and create 'tar.gz' package for it. ## Note that 'linux-arm' can only be built on Ubuntu environment. $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${arm32LinuxBuildFolder}" @@ -4600,14 +4599,14 @@ function Invoke-AzDevOpsLinuxPackageBuild { # Remove symbol files. Remove-Item "${buildFolder}\*.pdb" -Force } elseif ($BuildType -eq 'rpm') { - ## Build 'min-size' + ## Build for Mariner $options = Get-PSOptions - Write-Verbose -Verbose "---- Min-Size ----" + Write-Verbose -Verbose "---- Mariner ----" Write-Verbose -Verbose "options.Output: $($options.Output)" Write-Verbose -Verbose "options.Top $($options.Top)" $binDir = Join-Path -Path $options.Top -ChildPath 'bin' if (Test-Path -Path $binDir) { - Write-Verbose -Verbose "Remove $binDir, to get a clean build for min-size package" + Write-Verbose -Verbose "Remove $binDir, to get a clean build for Mariner package" Remove-Item -Path $binDir -Recurse -Force } diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml index cb5b7ea8e7..befcebf3bd 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -202,6 +202,10 @@ jobs: $BuildPath = '$(System.ArtifactsDirectory)\$(SymbolsFolder)' Update-PSSignedBuildFolder -BuildPath $BuildPath -SignedFilesPath $SignedFilesPath + if ($env:BuildConfiguration -eq 'minSize') { + ## Remove XML files when making a min-size package. + Remove-Item "$BuildPath/*.xml" -Force + } displayName: Merge ThirdParty signed files with Build condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')) |