Skip to content

Commit aba87e1

Browse files
authored
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.4xx' (#20796)
2 parents a9933f9 + a3965b1 commit aba87e1

File tree

2 files changed

+15
-62
lines changed

2 files changed

+15
-62
lines changed

src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ resources:
3434
extends:
3535
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
3636
parameters:
37+
containers:
38+
licenseScanContainer:
39+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-source-build-test-amd64
40+
options: '--memory=12g'
3741
pool:
3842
name: NetCore1ESPool-Svc-Internal
3943
image: 1es-ubuntu-2204
@@ -83,15 +87,21 @@ extends:
8387
8488
- job: LicenseScan
8589
dependsOn: Setup
86-
container:
87-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-source-build-test-amd64
88-
options: '--memory=12g'
90+
container: licenseScanContainer
8991
pool:
9092
name: NetCore1ESPool-Svc-Internal
9193
demands: ImageOverride -equals 1es-ubuntu-2204
9294
timeoutInMinutes: 420
9395
strategy:
9496
matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
97+
templateContext:
98+
outputs:
99+
- output: pipelineArtifact
100+
displayName: Publish BuildLogs
101+
continueOnError: true
102+
condition: succeededOrFailed()
103+
targetPath: '$(Build.StagingDirectory)/BuildLogs'
104+
artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
95105
steps:
96106

97107
- script: >
@@ -133,12 +143,6 @@ extends:
133143
continueOnError: true
134144
condition: succeededOrFailed()
135145
136-
- publish: '$(Build.StagingDirectory)/BuildLogs'
137-
artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
138-
displayName: Publish BuildLogs
139-
continueOnError: true
140-
condition: succeededOrFailed()
141-
142146
- task: PublishTestResults@2
143147
displayName: Publish Test Results
144148
condition: succeededOrFailed()
@@ -158,7 +162,7 @@ extends:
158162
name: NetCore1ESPool-Svc-Internal
159163
demands: ImageOverride -equals 1es-ubuntu-2204
160164
variables:
161-
- template: templates/variables/pipelines.yml
165+
- template: /eng/pipelines/templates/variables/pipelines.yml@self
162166
steps:
163167

164168
- script: |
@@ -186,7 +190,7 @@ extends:
186190
find $(Pipeline.Workspace)/Artifacts -type f -exec mv {} $(Pipeline.Workspace)/Artifacts \;
187191
displayName: Move Artifacts to root
188192
189-
- template: templates/steps/create-baseline-update-pr.yml
193+
- template: /eng/pipelines/templates/steps/create-baseline-update-pr.yml@self
190194
parameters:
191195
dotnetPath: $(DotNetPath)
192196
pipeline: license

src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)