Skip to content

Commit cf57d2c

Browse files
amcaseyamcasey
authored
Merge branch 'main' into linux-dev-certs
2 parents 42a6608 + ef09c06 commit cf57d2c

File tree

363 files changed

+11506
-2803
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+11506
-2803
lines changed

‎.azure/pipelines/ci-public.yml‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ stages:
101101
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
102102
displayName: Run eng/scripts/CodeCheck.ps1
103103
artifacts:
104-
- name: Code_Check_Logs
104+
- name: Code_Check_Logs_Attempt_$(System.JobAttempt)
105105
path: artifacts/log/
106106
publishOnError: true
107107
includeForks: true
@@ -227,7 +227,7 @@ stages:
227227
displayName: Build ARM64 Installers
228228

229229
artifacts:
230-
- name: Windows_Logs
230+
- name: Windows_Logs_Attempt_$(System.JobAttempt)
231231
path: artifacts/log/
232232
publishOnError: true
233233
includeForks: true
@@ -259,7 +259,7 @@ stages:
259259
$(_PublishArgs)
260260
$(_InternalRuntimeDownloadArgs)
261261
artifacts:
262-
- name: MacOS_arm64_Logs
262+
- name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
263263
path: artifacts/log/
264264
publishOnError: true
265265
includeForks: true
@@ -289,7 +289,7 @@ stages:
289289
$(_PublishArgs)
290290
$(_InternalRuntimeDownloadArgs)
291291
artifacts:
292-
- name: MacOS_x64_Logs
292+
- name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
293293
path: artifacts/log/
294294
publishOnError: true
295295
includeForks: true
@@ -351,7 +351,7 @@ stages:
351351
displayName: Build RPM installers
352352
target: rpmpkg
353353
artifacts:
354-
- name: Linux_x64_Logs
354+
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
355355
path: artifacts/log/
356356
publishOnError: true
357357
includeForks: true
@@ -381,7 +381,7 @@ stages:
381381
$(_PublishArgs)
382382
$(_InternalRuntimeDownloadArgs)
383383
artifacts:
384-
- name: Linux_arm_Logs
384+
- name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
385385
path: artifacts/log/
386386
publishOnError: true
387387
includeForks: true
@@ -428,7 +428,7 @@ stages:
428428
displayName: Build RPM installers
429429
target: rpmpkg
430430
artifacts:
431-
- name: Linux_arm64_Logs
431+
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
432432
path: artifacts/log/
433433
publishOnError: true
434434
includeForks: true
@@ -462,7 +462,7 @@ stages:
462462
installNodeJs: false
463463
disableComponentGovernance: true
464464
artifacts:
465-
- name: Linux_musl_x64_Logs
465+
- name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
466466
path: artifacts/log/
467467
publishOnError: true
468468
includeForks: true
@@ -495,7 +495,7 @@ stages:
495495
$(_PublishArgs)
496496
$(_InternalRuntimeDownloadArgs)
497497
artifacts:
498-
- name: Linux_musl_arm_Logs
498+
- name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
499499
path: artifacts/log/
500500
publishOnError: true
501501
includeForks: true
@@ -528,7 +528,7 @@ stages:
528528
$(_PublishArgs)
529529
$(_InternalRuntimeDownloadArgs)
530530
artifacts:
531-
- name: Linux_musl_arm64_Logs
531+
- name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
532532
path: artifacts/log/
533533
publishOnError: true
534534
includeForks: true
@@ -556,15 +556,22 @@ stages:
556556
beforeBuild:
557557
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
558558
displayName: Setup IISExpress test certificates and schema
559+
afterBuild:
560+
- powershell: ./eng/scripts/CompareMinifiedJsFiles.ps1
561+
displayName: Check for changes in generated minified .js files
559562
artifacts:
560-
- name: Windows_Test_Logs
563+
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
561564
path: artifacts/log/
562565
publishOnError: true
563566
includeForks: true
564-
- name: Windows_Test_Results
567+
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
565568
path: artifacts/TestResults/
566569
publishOnError: true
567570
includeForks: true
571+
- name: Minified_JS_Files
572+
path: src/Components/Web.JS/dist/Release/
573+
publishOnError: true
574+
includeForks: true
568575

569576
- template: jobs/default-build.yml
570577
parameters:
@@ -578,11 +585,11 @@ stages:
578585
- bash: "./eng/scripts/install-nginx-mac.sh"
579586
displayName: Installing Nginx
580587
artifacts:
581-
- name: MacOS_Test_Logs
588+
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
582589
path: artifacts/log/
583590
publishOnError: true
584591
includeForks: true
585-
- name: MacOS_Test_Results
592+
- name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
586593
path: artifacts/TestResults/
587594
publishOnError: true
588595
includeForks: true
@@ -601,11 +608,11 @@ stages:
601608
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
602609
displayName: Increase inotify limit
603610
artifacts:
604-
- name: Linux_Test_Logs
611+
- name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
605612
path: artifacts/log/
606613
publishOnError: true
607614
includeForks: true
608-
- name: Linux_Test_Results
615+
- name: Linux_Test_Results_Attempt_$(System.JobAttempt)
609616
path: artifacts/TestResults/
610617
publishOnError: true
611618
includeForks: true
@@ -632,7 +639,7 @@ stages:
632639
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
633640

634641
artifacts:
635-
- name: Helix_logs
642+
- name: Helix_Logs_Attempt_$(System.JobAttempt)
636643
path: artifacts/log/
637644
publishOnError: true
638645
includeForks: true

‎.azure/pipelines/ci.yml‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ variables:
9696
value: /bl:artifacts/log/Release/Build.Installers.binlog
9797
- name: WindowsArm64InstallersLogArgs
9898
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
99-
- group: DotNetBuilds storage account read tokens
10099
- name: _InternalRuntimeDownloadArgs
101100
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
102101
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
@@ -167,7 +166,7 @@ extends:
167166
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
168167
displayName: Run eng/scripts/CodeCheck.ps1
169168
artifacts:
170-
- name: Code_Check_Logs
169+
- name: Code_Check_Logs_Attempt_$(System.JobAttempt)
171170
path: artifacts/log/
172171
publishOnError: true
173172
includeForks: true
@@ -293,7 +292,7 @@ extends:
293292
displayName: Build ARM64 Installers
294293

295294
artifacts:
296-
- name: Windows_Logs
295+
- name: Windows_Logs_Attempt_$(System.JobAttempt)
297296
path: artifacts/log/
298297
publishOnError: true
299298
includeForks: true
@@ -325,7 +324,7 @@ extends:
325324
$(_PublishArgs)
326325
$(_InternalRuntimeDownloadArgs)
327326
artifacts:
328-
- name: MacOS_arm64_Logs
327+
- name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
329328
path: artifacts/log/
330329
publishOnError: true
331330
includeForks: true
@@ -355,7 +354,7 @@ extends:
355354
$(_PublishArgs)
356355
$(_InternalRuntimeDownloadArgs)
357356
artifacts:
358-
- name: MacOS_x64_Logs
357+
- name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
359358
path: artifacts/log/
360359
publishOnError: true
361360
includeForks: true
@@ -417,7 +416,7 @@ extends:
417416
displayName: Build RPM installers
418417
target: rpmpkg
419418
artifacts:
420-
- name: Linux_x64_Logs
419+
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
421420
path: artifacts/log/
422421
publishOnError: true
423422
includeForks: true
@@ -447,7 +446,7 @@ extends:
447446
$(_PublishArgs)
448447
$(_InternalRuntimeDownloadArgs)
449448
artifacts:
450-
- name: Linux_arm_Logs
449+
- name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
451450
path: artifacts/log/
452451
publishOnError: true
453452
includeForks: true
@@ -494,7 +493,7 @@ extends:
494493
displayName: Build RPM installers
495494
target: rpmpkg
496495
artifacts:
497-
- name: Linux_arm64_Logs
496+
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
498497
path: artifacts/log/
499498
publishOnError: true
500499
includeForks: true
@@ -528,7 +527,7 @@ extends:
528527
installNodeJs: false
529528
disableComponentGovernance: true
530529
artifacts:
531-
- name: Linux_musl_x64_Logs
530+
- name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
532531
path: artifacts/log/
533532
publishOnError: true
534533
includeForks: true
@@ -561,7 +560,7 @@ extends:
561560
$(_PublishArgs)
562561
$(_InternalRuntimeDownloadArgs)
563562
artifacts:
564-
- name: Linux_musl_arm_Logs
563+
- name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
565564
path: artifacts/log/
566565
publishOnError: true
567566
includeForks: true
@@ -594,7 +593,7 @@ extends:
594593
$(_PublishArgs)
595594
$(_InternalRuntimeDownloadArgs)
596595
artifacts:
597-
- name: Linux_musl_arm64_Logs
596+
- name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
598597
path: artifacts/log/
599598
publishOnError: true
600599
includeForks: true
@@ -623,11 +622,11 @@ extends:
623622
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
624623
displayName: Setup IISExpress test certificates and schema
625624
artifacts:
626-
- name: Windows_Test_Logs
625+
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
627626
path: artifacts/log/
628627
publishOnError: true
629628
includeForks: true
630-
- name: Windows_Test_Results
629+
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
631630
path: artifacts/TestResults/
632631
publishOnError: true
633632
includeForks: true
@@ -644,11 +643,11 @@ extends:
644643
- bash: "./eng/scripts/install-nginx-mac.sh"
645644
displayName: Installing Nginx
646645
artifacts:
647-
- name: MacOS_Test_Logs
646+
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
648647
path: artifacts/log/
649648
publishOnError: true
650649
includeForks: true
651-
- name: MacOS_Test_Results
650+
- name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
652651
path: artifacts/TestResults/
653652
publishOnError: true
654653
includeForks: true
@@ -667,11 +666,11 @@ extends:
667666
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
668667
displayName: Increase inotify limit
669668
artifacts:
670-
- name: Linux_Test_Logs
669+
- name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
671670
path: artifacts/log/
672671
publishOnError: true
673672
includeForks: true
674-
- name: Linux_Test_Results
673+
- name: Linux_Test_Results_Attempt_$(System.JobAttempt)
675674
path: artifacts/TestResults/
676675
publishOnError: true
677676
includeForks: true
@@ -698,7 +697,7 @@ extends:
698697
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
699698

700699
artifacts:
701-
- name: Helix_logs
700+
- name: Helix_Logs_Attempt_$(System.JobAttempt)
702701
path: artifacts/log/
703702
publishOnError: true
704703
includeForks: true

‎.azure/pipelines/jobs/codesign-xplat.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
$(_InternalRuntimeDownloadCodeSignArgs)
4646
displayName: Sign and publish packages
4747
artifacts:
48-
- name: CodeSign_Xplat_${{ parameters.inputName }}_Logs
48+
- name: CodeSign_Xplat_${{ parameters.inputName }}_Logs_Attempt_$(System.JobAttempt)
4949
path: artifacts/log/
5050
publishOnError: true
5151
includeForks: true

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,18 @@ jobs:
420420
- ${{ parameters.beforeBuild }}
421421

422422
# - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self
423-
# - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml@self
423+
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml@self
424+
425+
# Populate dotnetbuilds-internal-container-read-token
426+
- template: /eng/common/templates-official/steps/get-delegation-sas.yml
427+
parameters:
428+
federatedServiceConnection: 'dotnetbuilds-internal-read'
429+
outputVariableName: 'dotnetbuilds-internal-container-read-token'
430+
expiryInHours: 1
431+
base64Encode: false
432+
storageAccount: dotnetbuilds
433+
container: internal
434+
permissions: rl
424435

425436
# Add COMPlus_* environment variables to build steps.
426437
- ${{ if ne(parameters.steps, '')}}:

‎.azure/pipelines/quarantined-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
jobDisplayName: 'Tests: Helix'
5151
agentOs: Windows
5252
installJdk: false
53-
timeoutInMinutes: 120
53+
timeoutInMinutes: 150
5454
steps:
5555
# Build the shared framework
5656
- script: ./eng/build.cmd -ci -prepareMachine -nobl -all -noBuildJava -pack -arch x64
@@ -110,7 +110,7 @@ jobs:
110110
jobName: MacOS_Quarantined_Test
111111
jobDisplayName: "Tests: macOS"
112112
agentOs: macOS
113-
timeoutInMinutes: 120
113+
timeoutInMinutes: 150
114114
isAzDOTestingJob: true
115115
enablePublishTestResults: false
116116
steps:

0 commit comments

Comments
 (0)