Skip to content

Commit 0624ce9

Browse files
dougbudougbu
committed
Restore creation of binary logs in CI runs
This reverts part of commit d5849f3. - was "[master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling (#21630)"
1 parent bad6e32 commit 0624ce9

File tree

3 files changed

+38
-32
lines changed

3 files changed

+38
-32
lines changed

‎.azure/pipelines/ci.yml‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ stages:
129129
# The sign settings have been configured to
130130
- script: ./build.cmd
131131
-ci
132-
-nobl
133132
-arch x64
134133
-pack
135134
-all
135+
/bl:artifacts/log/build.x64.binlog
136136
$(_BuildArgs)
137137
$(_InternalRuntimeDownloadArgs)
138138
displayName: Build x64
@@ -141,20 +141,19 @@ stages:
141141
# This is going to actually build x86 native assets.
142142
- script: ./build.cmd
143143
-ci
144-
-nobl
145144
-arch x86
146145
-pack
147146
-all
148147
-noBuildJava
149148
/p:OnlyPackPlatformSpecificPackages=true
149+
/bl:artifacts/log/build.x86.binlog
150150
$(_BuildArgs)
151151
$(_InternalRuntimeDownloadArgs)
152152
displayName: Build x86
153153

154154
# This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53
155155
- script: .\src\SiteExtensions\build.cmd
156156
-ci
157-
-nobl
158157
-pack
159158
-noBuildDeps
160159
$(_BuildArgs)
@@ -167,20 +166,20 @@ stages:
167166
# Sign check is disabled because it is run in a separate step below, after installers are built.
168167
- script: ./build.cmd
169168
-ci
170-
-nobl
171169
-noBuild
172170
-noRestore
173171
-sign
172+
/bl:artifacts/log/build.codesign.binlog
174173
/p:DotNetSignType=$(_SignType)
175174
$(_BuildArgs)
176175
displayName: Code sign packages
177176

178177
# Windows installers bundle both x86 and x64 assets
179178
- script: ./build.cmd
180179
-ci
181-
-nobl
182180
-sign
183181
-buildInstallers
182+
/bl:artifacts/log/installers.msbuild.binlog
184183
/p:DotNetSignType=$(_SignType)
185184
/p:AssetManifestFileName=aspnetcore-win-x64-x86.xml
186185
$(_BuildArgs)
@@ -220,6 +219,7 @@ stages:
220219
-pack
221220
-noBuildNodeJS
222221
-noBuildJava
222+
/bl:artifacts/log/build.win-arm.binlog
223223
/p:DotNetSignType=$(_SignType)
224224
/p:OnlyPackPlatformSpecificPackages=true
225225
/p:AssetManifestFileName=aspnetcore-win-arm.xml
@@ -249,6 +249,7 @@ stages:
249249
-pack
250250
-noBuildNodeJS
251251
-noBuildJava
252+
/bl:artifacts/log/build.win-arm64.binlog
252253
/p:DotNetSignType=$(_SignType)
253254
/p:OnlyPackPlatformSpecificPackages=true
254255
/p:AssetManifestFileName=aspnetcore-win-arm64.xml
@@ -279,6 +280,7 @@ stages:
279280
--no-build-nodejs
280281
--no-build-java
281282
-p:OnlyPackPlatformSpecificPackages=true
283+
-bl:artifacts/log/build.macos.binlog
282284
-p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
283285
$(_BuildArgs)
284286
$(_PublishArgs)
@@ -306,43 +308,43 @@ stages:
306308
steps:
307309
- script: ./build.sh
308310
--ci
309-
--nobl
310311
--arch x64
311312
--pack
312313
--all
313314
--no-build-nodejs
314315
--no-build-java
315316
-p:OnlyPackPlatformSpecificPackages=true
317+
-bl:artifacts/log/build.linux-x64.binlog
316318
$(_BuildArgs)
317319
$(_InternalRuntimeDownloadArgs)
318320
displayName: Run build.sh
319321
- script: |
320322
git clean -xfd src/**/obj/
321323
./dockerbuild.sh bionic \
322324
--ci \
323-
--nobl \
324325
--arch x64 \
325326
--build-installers \
326327
--no-build-deps \
327328
--no-build-nodejs \
328329
-p:OnlyPackPlatformSpecificPackages=true \
329330
-p:BuildRuntimeArchive=false \
330331
-p:LinuxInstallerType=deb \
332+
-bl:artifacts/log/build.deb.binlog \
331333
$(_BuildArgs) \
332334
$(_InternalRuntimeDownloadArgs)
333335
displayName: Build Debian installers
334336
- script: |
335337
git clean -xfd src/**/obj/
336338
./dockerbuild.sh rhel \
337339
--ci \
338-
--nobl \
339340
--arch x64 \
340341
--build-installers \
341342
--no-build-deps \
342343
--no-build-nodejs \
343344
-p:OnlyPackPlatformSpecificPackages=true \
344345
-p:BuildRuntimeArchive=false \
345346
-p:LinuxInstallerType=rpm \
347+
-bl:artifacts/log/build.rpm.binlog \
346348
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml \
347349
$(_BuildArgs) \
348350
$(_PublishArgs) \
@@ -374,6 +376,7 @@ stages:
374376
--no-build-nodejs
375377
--no-build-java
376378
-p:OnlyPackPlatformSpecificPackages=true
379+
-bl:artifacts/log/build.linux-arm.binlog
377380
-p:AssetManifestFileName=aspnetcore-Linux_arm.xml
378381
$(_BuildArgs)
379382
$(_PublishArgs)
@@ -404,6 +407,7 @@ stages:
404407
--no-build-nodejs
405408
--no-build-java
406409
-p:OnlyPackPlatformSpecificPackages=true
410+
-bl:artifacts/log/build.arm64.binlog
407411
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
408412
$(_BuildArgs)
409413
$(_PublishArgs)
@@ -436,6 +440,7 @@ stages:
436440
--no-build-nodejs
437441
--no-build-java
438442
-p:OnlyPackPlatformSpecificPackages=true
443+
-bl:artifacts/log/build.musl.binlog
439444
-p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
440445
$(_BuildArgs)
441446
$(_PublishArgs)
@@ -469,6 +474,7 @@ stages:
469474
--no-build-nodejs
470475
--no-build-java
471476
-p:OnlyPackPlatformSpecificPackages=true
477+
-bl:artifacts/log/build.musl.binlog
472478
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
473479
$(_BuildArgs)
474480
$(_PublishArgs)
@@ -499,7 +505,7 @@ stages:
499505
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
500506
displayName: Setup IISExpress test certificates and schema
501507
afterBuild:
502-
- powershell: "& ./build.ps1 -CI -nobl -NoBuild -Test /p:RunQuarantinedTests=true"
508+
- powershell: "& ./build.ps1 -CI -NoBuild -Test /p:RunQuarantinedTests=true"
503509
displayName: Run Quarantined Tests
504510
continueOnError: true
505511
- task: PublishTestResults@2
@@ -530,11 +536,11 @@ stages:
530536
agentOs: Windows
531537
isTestingJob: true
532538
steps:
533-
- script: ./build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
539+
- script: ./build.cmd -ci -all -pack $(_InternalRuntimeDownloadArgs)
534540
displayName: Build Repo
535-
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true"
541+
- script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.pack.binlog"
536542
displayName: Pack Templates
537-
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
543+
- script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.test.binlog"
538544
displayName: Test Templates
539545
artifacts:
540546
- name: Windows_Test_Templates_Dumps
@@ -562,11 +568,11 @@ stages:
562568
- bash: "./eng/scripts/install-nginx-mac.sh"
563569
displayName: Installing Nginx
564570
afterBuild:
565-
- bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
571+
- bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
566572
displayName: Pack Packages (for Template tests)
567-
- bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
573+
- bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
568574
displayName: Pack Templates (for Template tests)
569-
- bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
575+
- bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
570576
displayName: Run Quarantined Tests
571577
continueOnError: true
572578
- task: PublishTestResults@2
@@ -600,11 +606,11 @@ stages:
600606
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
601607
displayName: Increase inotify limit
602608
afterBuild:
603-
- bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
609+
- bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
604610
displayName: Pack Packages (for Template tests)
605-
- bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
611+
- bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
606612
displayName: Pack Templates (for Template tests)
607-
- bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
613+
- bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
608614
displayName: Run Quarantined Tests
609615
continueOnError: true
610616
- task: PublishTestResults@2
@@ -633,11 +639,11 @@ stages:
633639
timeoutInMinutes: 180
634640
steps:
635641
# Build the shared framework
636-
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
642+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
637643
displayName: Build shared fx
638-
- script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
644+
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
639645
displayName: Restore interop projects
640-
- script: .\build.cmd -ci -nobl -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
646+
- 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
641647
displayName: Run build.cmd helix target
642648
env:
643649
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -657,11 +663,11 @@ stages:
657663
timeoutInMinutes: 180
658664
steps:
659665
# Build the shared framework
660-
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
666+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
661667
displayName: Build shared fx
662-
- script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
668+
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
663669
displayName: Restore interop projects
664-
- script: .\build.cmd -ci -nobl -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
670+
- 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
665671
displayName: Run build.cmd helix target
666672
env:
667673
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -682,9 +688,9 @@ stages:
682688
timeoutInMinutes: 180
683689
steps:
684690
# Build the shared framework
685-
- script: ./restore.sh -ci -nobl
691+
- script: ./restore.sh -ci
686692
displayName: Restore
687-
- script: ./build.sh -ci --nobl --arch arm64 -test --no-build-nodejs --all -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
693+
- script: ./build.sh -ci --arch arm64 -test --no-build-nodejs --all -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
688694
displayName: Run build.sh helix arm64 target
689695
env:
690696
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -721,7 +727,7 @@ stages:
721727
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
722728
env:
723729
Token: $(dn-bot-dnceng-artifact-feeds-rw)
724-
- script: ./eng/scripts/ci-source-build.sh --ci --nobl --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
730+
- script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
725731
displayName: Run ci-source-build.sh
726732
- task: PublishBuildArtifacts@1
727733
displayName: Upload logs

‎.azure/pipelines/jobs/default-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,13 @@ jobs:
191191
- ${{ if eq(parameters.steps, '')}}:
192192
- ${{ if eq(parameters.buildScript, '') }}:
193193
- ${{ if eq(parameters.agentOs, 'Windows') }}:
194-
- script: .\$(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
194+
- script: .\$(BuildDirectory)\build.cmd -ci -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
195195
displayName: Run build.cmd
196196
- ${{ if ne(parameters.agentOs, 'Windows') }}:
197-
- script: ./$(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
197+
- script: ./$(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
198198
displayName: Run build.sh
199199
- ${{ if ne(parameters.buildScript, '') }}:
200-
- script: $(BuildScript) -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
200+
- script: $(BuildScript) -ci -Configuration $(BuildConfiguration) $(BuildScriptArgs)
201201
displayName: run $(BuildScript)
202202

203203
- ${{ parameters.afterBuild }}

‎eng/scripts/CodeCheck.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ try {
4848
if ($ci) {
4949
# Install dotnet.exe
5050
if ($DotNetRuntimeSourceFeed -or $DotNetRuntimeSourceFeedKey) {
51-
& $repoRoot/restore.cmd -ci -nobl -noBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
51+
& $repoRoot/restore.cmd -ci -noBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
5252
}
5353
else{
54-
& $repoRoot/restore.cmd -ci -nobl -noBuildNodeJS
54+
& $repoRoot/restore.cmd -ci -noBuildNodeJS
5555
}
5656
}
5757

0 commit comments

Comments
 (0)