Skip to content

Commit 67333f8

Browse files
author
John Luo
committed
Update log directory
This will now include functional test logs
1 parent a05d555 commit 67333f8

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

.azure/pipelines/ci.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
# if they have already been signed. This results in slower builds due to re-submitting the same .nupkg many times for signing.
4747
# The sign settings have been configured to
4848

49-
- script: ./eng/scripts/cibuild.cmd -arch x64 /p:DisableCodeSigning=true /bl:artifacts/logs/build.x64.binlog
49+
- script: ./eng/scripts/cibuild.cmd -arch x64 /p:DisableCodeSigning=true /bl:artifacts/log/build.x64.binlog
5050
displayName: Build x64
5151
# TODO: make it possible to build for one Windows architecture at a time
5252
# This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196
5353

5454
# Build the x86 shared framework
5555
# Set DisableSignCheck because we'll run sign check in an explicit step after installers build
56-
- script: ./eng/scripts/cibuild.cmd -arch x86 -NoRestore /t:BuildSharedFx /p:DisableCodeSigning=true /bl:artifacts/logs/build.x86.binlog
56+
- script: ./eng/scripts/cibuild.cmd -arch x86 -NoRestore /t:BuildSharedFx /p:DisableCodeSigning=true /bl:artifacts/log/build.x86.binlog
5757
displayName: Build x86
5858

5959
# This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53
@@ -67,15 +67,15 @@ jobs:
6767
# This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved,
6868
# consider running code-signing inline with the other previous steps.
6969
# Sign check is disabled because it is run in a separate step below, after installers are built.
70-
- script: ./build.cmd -ci -sign -NoRestore /t:CodeSign /p:SignType=$(_SignType) /p:DisableSignCheck=true /bl:artifacts/logs/build.codesign.binlog
70+
- script: ./build.cmd -ci -sign -NoRestore /t:CodeSign /p:SignType=$(_SignType) /p:DisableSignCheck=true /bl:artifacts/log/build.codesign.binlog
7171
displayName: Code sign packages
7272

7373
# Windows installers bundle both x86 and x64 assets
7474
- powershell: ./src/Installers/Windows/build.ps1 -ci /p:SignType=$(_SignType)
7575
displayName: Build Installers
7676

7777
# Run sign check to verify everything was code signed.
78-
- script: ./build.cmd -ci -sign -NoRestore /t:SignCheck /p:SignType=$(_SignType) /bl:artifacts/logs/build.signcheck.binlog
78+
- script: ./build.cmd -ci -sign -NoRestore /t:SignCheck /p:SignType=$(_SignType) /bl:artifacts/log/build.signcheck.binlog
7979
displayName: Run sign check
8080
condition: eq(variables['_SignType'], 'real')
8181

@@ -89,7 +89,7 @@ jobs:
8989
- name: Windows_Installers
9090
path: artifacts/installers/
9191
- name: Windows_Logs
92-
path: artifacts/logs/
92+
path: artifacts/log/
9393
publishOnError: true
9494

9595
# Build Windows ARM
@@ -100,7 +100,7 @@ jobs:
100100
jobDisplayName: "Build: Windows ARM"
101101
agentOs: Windows
102102
buildScript: ./eng/scripts/cibuild.cmd
103-
buildArgs: -arch arm -NoBuildNodeJS -NoBuildJava /p:SignType=$(_SignType) /bl:artifacts/logs/build.win-arm.binlog
103+
buildArgs: -arch arm -NoBuildNodeJS -NoBuildJava /p:SignType=$(_SignType) /bl:artifacts/log/build.win-arm.binlog
104104
installNodeJs: false
105105
installJdk: false
106106
afterBuild:
@@ -115,7 +115,7 @@ jobs:
115115
- name: Windows_arm_Installers
116116
path: artifacts/installers/
117117
- name: Windows_arm_Logs
118-
path: artifacts/logs/
118+
path: artifacts/log/
119119
publishOnError: true
120120

121121
# Build MacOS
@@ -125,7 +125,7 @@ jobs:
125125
jobDisplayName: "Build: macOS"
126126
agentOs: macOs
127127
buildScript: ./eng/scripts/cibuild.sh
128-
buildArgs: --no-build-nodejs --no-build-java /bl:artifacts/logs/build.macos.binlog
128+
buildArgs: --no-build-nodejs --no-build-java /bl:artifacts/log/build.macos.binlog
129129
installNodeJs: false
130130
afterBuild:
131131
# Remove packages that are not rid-specific.
@@ -140,7 +140,7 @@ jobs:
140140
- name: MacOS_x64_Installers
141141
path: artifacts/installers/
142142
- name: MacOS_x64_Logs
143-
path: artifacts/logs/
143+
path: artifacts/log/
144144
publishOnError: true
145145
- template: jobs/codesign-xplat.yml
146146
parameters:
@@ -154,7 +154,7 @@ jobs:
154154
agentOs: Linux
155155
installNodeJs: false
156156
steps:
157-
- script: ./eng/scripts/cibuild.sh --arch x64 --no-build-nodejs --no-build-java /bl:artifacts/logs/build.lin-x64.binlog
157+
- script: ./eng/scripts/cibuild.sh --arch x64 --no-build-nodejs --no-build-java /bl:artifacts/log/build.lin-x64.binlog
158158
displayName: Run cibuild.sh
159159
- script: |
160160
rm -rf .dotnet/
@@ -168,7 +168,7 @@ jobs:
168168
/t:BuildSharedFx \
169169
/p:BuildRuntimeArchive=false \
170170
/p:LinuxInstallerType=deb \
171-
/bl:artifacts/logs/build.deb.binlog
171+
/bl:artifacts/log/build.deb.binlog
172172
displayName: Build Debian installers
173173
- script: |
174174
rm -rf .dotnet/
@@ -182,7 +182,7 @@ jobs:
182182
/t:BuildSharedFx \
183183
/p:BuildRuntimeArchive=false \
184184
/p:LinuxInstallerType=rpm \
185-
/bl:artifacts/logs/build.rpm.binlog
185+
/bl:artifacts/log/build.rpm.binlog
186186
displayName: Build RPM installers
187187
afterBuild:
188188
# Remove packages that are not rid-specific.
@@ -197,7 +197,7 @@ jobs:
197197
- name: Linux_x64_Installers
198198
path: artifacts/installers/
199199
- name: Linux_x64_Logs
200-
path: artifacts/logs/
200+
path: artifacts/log/
201201
publishOnError: true
202202
- template: jobs/codesign-xplat.yml
203203
parameters:
@@ -210,7 +210,7 @@ jobs:
210210
jobDisplayName: "Build: Linux ARM"
211211
agentOs: Linux
212212
buildScript: ./eng/scripts/cibuild.sh
213-
buildArgs: --arch arm --no-build-nodejs --no-build-java /bl:artifacts/logs/build.lin-arm.binlog
213+
buildArgs: --arch arm --no-build-nodejs --no-build-java /bl:artifacts/log/build.lin-arm.binlog
214214
installNodeJs: false
215215
afterBuild:
216216
# Remove packages that are not rid-specific.
@@ -225,7 +225,7 @@ jobs:
225225
- name: Linux_arm_Installers
226226
path: artifacts/installers/
227227
- name: Linux_arm_Logs
228-
path: artifacts/logs/
228+
path: artifacts/log/
229229
publishOnError: true
230230
- template: jobs/codesign-xplat.yml
231231
parameters:
@@ -238,7 +238,7 @@ jobs:
238238
jobDisplayName: "Build: Linux ARM64"
239239
agentOs: Linux
240240
buildScript: ./eng/scripts/cibuild.sh
241-
buildArgs: --arch arm64 --no-build-nodejs --no-build-java /bl:artifacts/logs/build.arm64.binlog
241+
buildArgs: --arch arm64 --no-build-nodejs --no-build-java /bl:artifacts/log/build.arm64.binlog
242242
installNodeJs: false
243243
afterBuild:
244244
# Remove packages that are not rid-specific.
@@ -253,7 +253,7 @@ jobs:
253253
- name: Linux_arm64_Installers
254254
path: artifacts/installers/
255255
- name: Linux_arm64_Logs
256-
path: artifacts/logs/
256+
path: artifacts/log/
257257
publishOnError: true
258258
- template: jobs/codesign-xplat.yml
259259
parameters:
@@ -266,7 +266,7 @@ jobs:
266266
jobDisplayName: "Build: Linux Musl x64"
267267
agentOs: Linux
268268
buildScript: ./dockerbuild.sh alpine
269-
buildArgs: --ci --pack --all -e KOREBUILD_SKIP_INSTALL_NETFX=0 --arch x64 --os-name linux-musl --no-build-nodejs --no-build-java /bl:artifacts/logs/build.musl.binlog
269+
buildArgs: --ci --pack --all -e KOREBUILD_SKIP_INSTALL_NETFX=0 --arch x64 --os-name linux-musl --no-build-nodejs --no-build-java /bl:artifacts/log/build.musl.binlog
270270
installNodeJs: false
271271
afterBuild:
272272
# Remove packages that are not rid-specific.
@@ -281,7 +281,7 @@ jobs:
281281
- name: Linux_musl_x64_Installers
282282
path: artifacts/installers/
283283
- name: Linux_musl_x64_Logs
284-
path: artifacts/logs/
284+
path: artifacts/log/
285285
publishOnError: true
286286
- template: jobs/codesign-xplat.yml
287287
parameters:
@@ -294,7 +294,7 @@ jobs:
294294
jobDisplayName: "Build: Linux Musl ARM64"
295295
agentOs: Linux
296296
buildScript: ./dockerbuild.sh ubuntu-alpine37
297-
buildArgs: --ci --pack --all -e KOREBUILD_SKIP_INSTALL_NETFX=0 --arch arm64 --os-name linux-musl --no-build-nodejs --no-build-java /bl:artifacts/logs/build.musl.binlog
297+
buildArgs: --ci --pack --all -e KOREBUILD_SKIP_INSTALL_NETFX=0 --arch arm64 --os-name linux-musl --no-build-nodejs --no-build-java /bl:artifacts/log/build.musl.binlog
298298
installNodeJs: false
299299
afterBuild:
300300
# Remove packages that are not rid-specific.
@@ -309,7 +309,7 @@ jobs:
309309
- name: Linux_musl_arm64_Installers
310310
path: artifacts/installers/
311311
- name: Linux_musl_arm64_Logs
312-
path: artifacts/logs/
312+
path: artifacts/log/
313313
publishOnError: true
314314
- template: jobs/codesign-xplat.yml
315315
parameters:
@@ -334,7 +334,7 @@ jobs:
334334
continueOnError: true
335335
artifacts:
336336
- name: Windows_Test_Logs
337-
path: artifacts/logs/
337+
path: artifacts/log/
338338
publishOnError: true
339339

340340
- template: jobs/default-build.yml
@@ -351,7 +351,7 @@ jobs:
351351
displayName: Build Repo
352352
artifacts:
353353
- name: Windows_Test_Templates_Logs
354-
path: artifacts/logs/
354+
path: artifacts/log/
355355
publishOnError: true
356356

357357
- template: jobs/default-build.yml
@@ -372,7 +372,7 @@ jobs:
372372
continueOnError: true
373373
artifacts:
374374
- name: MacOS_Test_Logs
375-
path: artifacts/logs/
375+
path: artifacts/log/
376376
publishOnError: true
377377

378378
- template: jobs/default-build.yml
@@ -395,5 +395,5 @@ jobs:
395395
continueOnError: true
396396
artifacts:
397397
- name: Linux_Test_Logs
398-
path: artifacts/logs/
398+
path: artifacts/log/
399399
publishOnError: true

0 commit comments

Comments
 (0)