Skip to content

Commit 084f1af

Browse files
authored
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#20684)
2 parents 4bb73a8 + 5459d76 commit 084f1af

File tree

3 files changed

+5
-39
lines changed

3 files changed

+5
-39
lines changed

eng/install-scancode.sh

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

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ jobs:
6363
6464
- job: LicenseScan
6565
dependsOn: Setup
66+
container:
67+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-source-build-test-amd64
68+
options: '--memory=6g'
6669
pool:
6770
name: NetCore1ESPool-Svc-Internal
6871
demands: ImageOverride -equals 1es-ubuntu-2204
@@ -71,20 +74,8 @@ jobs:
7174
matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
7275
steps:
7376

74-
- script: $(Build.SourcesDirectory)/prep.sh --no-artifacts --no-bootstrap --no-prebuilts
75-
displayName: 'Install .NET SDK'
76-
77-
- task: PipAuthenticate@1
78-
displayName: 'Pip Authenticate'
79-
inputs:
80-
artifactFeeds: public/dotnet-public-pypi
81-
onlyAddExtraIndex: false
82-
83-
- script: $(installerRoot)/eng/install-scancode.sh
84-
displayName: Install Scancode
85-
8677
- script: >
87-
$(Build.SourcesDirectory)/.dotnet/dotnet test
78+
dotnet test
8879
$(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
8980
--filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.LicenseScanTests.ScanForLicenses"
9081
--logger:'trx;LogFileName=$(Agent.JobName)_LicenseScan.trx'

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void ScanForLicenses()
146146
Assert.NotNull(Config.LicenseScanPath);
147147

148148
// Indicates how long until a timeout occurs for scanning a given file
149-
const int FileScanTimeoutSeconds = 240;
149+
const int FileScanTimeoutSeconds = 1800;
150150

151151
string scancodeResultsPath = Path.Combine(LogsDirectory, "scancode-results.json");
152152

0 commit comments

Comments
 (0)