Skip to content

Commit c8652df

Browse files
committed
Disable binary logs in Windows jobs
1 parent 0309790 commit c8652df

File tree

3 files changed

+8
-26
lines changed

3 files changed

+8
-26
lines changed

.azure/pipelines/ci.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ stages:
132132
-arch x64
133133
-pack
134134
-all
135-
/bl:artifacts/log/build.x64.binlog
136135
'/fileLoggerParameters:LogFile=artifacts/log/performance.x64.log;PerformanceSummary;Verbosity=Quiet'
137136
$(_BuildArgs)
138137
$(_InternalRuntimeDownloadArgs)
@@ -147,7 +146,6 @@ stages:
147146
-all
148147
-noBuildJava
149148
/p:OnlyPackPlatformSpecificPackages=true
150-
/bl:artifacts/log/build.x86.binlog
151149
'/fileLoggerParameters:LogFile=artifacts/log/performance.x86.log;PerformanceSummary;Verbosity=Quiet'
152150
$(_BuildArgs)
153151
$(_InternalRuntimeDownloadArgs)
@@ -171,7 +169,6 @@ stages:
171169
-noBuild
172170
-noRestore
173171
-sign
174-
/bl:artifacts/log/build.codesign.binlog
175172
/p:DotNetSignType=$(_SignType)
176173
$(_BuildArgs)
177174
displayName: Code sign packages
@@ -181,7 +178,6 @@ stages:
181178
-ci
182179
-sign
183180
-buildInstallers
184-
/bl:artifacts/log/installers.msbuild.binlog
185181
/p:DotNetSignType=$(_SignType)
186182
/p:AssetManifestFileName=aspnetcore-win-x64-x86.xml
187183
$(_BuildArgs)
@@ -221,7 +217,6 @@ stages:
221217
-pack
222218
-noBuildNodeJS
223219
-noBuildJava
224-
/bl:artifacts/log/build.win-arm.binlog
225220
/p:DotNetSignType=$(_SignType)
226221
/p:OnlyPackPlatformSpecificPackages=true
227222
/p:AssetManifestFileName=aspnetcore-win-arm.xml
@@ -251,7 +246,6 @@ stages:
251246
-pack
252247
-noBuildNodeJS
253248
-noBuildJava
254-
/bl:artifacts/log/build.win-arm64.binlog
255249
/p:DotNetSignType=$(_SignType)
256250
/p:OnlyPackPlatformSpecificPackages=true
257251
/p:AssetManifestFileName=aspnetcore-win-arm64.xml
@@ -542,9 +536,9 @@ stages:
542536
steps:
543537
- script: ./build.cmd -ci -all -pack $(_InternalRuntimeDownloadArgs)
544538
displayName: Build Repo
545-
- script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.pack.binlog"
539+
- script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true
546540
displayName: Pack Templates
547-
- script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.test.binlog"
541+
- script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true
548542
displayName: Test Templates
549543
artifacts:
550544
- name: Windows_Test_Templates_Dumps
@@ -643,11 +637,11 @@ stages:
643637
timeoutInMinutes: 180
644638
steps:
645639
# Build the shared framework
646-
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
640+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
647641
displayName: Build shared fx
648642
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
649643
displayName: Restore interop projects
650-
- script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
644+
- script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
651645
displayName: Run build.cmd helix target
652646
env:
653647
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -667,11 +661,11 @@ stages:
667661
timeoutInMinutes: 180
668662
steps:
669663
# Build the shared framework
670-
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
664+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
671665
displayName: Build shared fx
672666
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
673667
displayName: Restore interop projects
674-
- script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
668+
- script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
675669
displayName: Run build.cmd helix target
676670
env:
677671
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

build.ps1

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -344,13 +344,6 @@ if ($ForceCoreMsbuild) {
344344
$msbuildEngine = 'dotnet'
345345
}
346346

347-
# Workaround Arcade check which asserts BinaryLog is true on CI.
348-
# We always use binlogs on CI, but we customize the name of the log file
349-
$tmpBinaryLog = $BinaryLog
350-
if ($CI) {
351-
$BinaryLog = $true
352-
}
353-
354347
# tools.ps1 corrupts global state, so reset these values in case they carried over from a previous build
355348
Remove-Item variable:global:_BuildTool -ea Ignore
356349
Remove-Item variable:global:_DotNetInstallDir -ea Ignore
@@ -360,7 +353,7 @@ Remove-Item variable:global:_MSBuildExe -ea Ignore
360353
# Import Arcade
361354
. "$PSScriptRoot/eng/common/tools.ps1"
362355

363-
if ($tmpBinaryLog) {
356+
if ($BinaryLog) {
364357
$MSBuildArguments += "/bl:$LogDir/Build.binlog"
365358
}
366359

eng/common/tools.ps1

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# Set to true to output binary log from msbuild. Note that emitting binary log slows down the build.
1111
# Binary log must be enabled on CI.
12-
[bool]$binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $ci }
12+
[bool]$binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $false }
1313

1414
# Set to true to use the pipelines logger which will enable Azure logging output.
1515
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
@@ -605,11 +605,6 @@ function MSBuild() {
605605
#
606606
function MSBuild-Core() {
607607
if ($ci) {
608-
if (!$binaryLog) {
609-
Write-PipelineTelemetryError -Category 'Build' -Message 'Binary log must be enabled in CI build.'
610-
ExitWithExitCode 1
611-
}
612-
613608
if ($nodeReuse) {
614609
Write-PipelineTelemetryError -Category 'Build' -Message 'Node reuse must be disabled in CI build.'
615610
ExitWithExitCode 1

0 commit comments

Comments
 (0)