Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions eng/install-scancode.sh

This file was deleted.

15 changes: 5 additions & 10 deletions src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ extends:
name: NetCore1ESPool-Svc-Internal
image: 1es-ubuntu-2204
os: linux
containers:
azurelinuxSourceBuildTestContainer:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-source-build-test-amd64
sdl:
sourceAnalysisPool:
name: NetCore1ESPool-Svc-Internal
Expand Down Expand Up @@ -98,6 +101,7 @@ extends:
displayName: Get Matrix

- job: LicenseScan
container: azurelinuxSourceBuildTestContainer
dependsOn: Setup
timeoutInMinutes: 420
strategy:
Expand All @@ -111,23 +115,14 @@ extends:
artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
steps:

- script: |
source ./eng/common/tools.sh
InitializeDotNetCli true
displayName: Install .NET SDK
workingDirectory: $(Build.SourcesDirectory)

- task: PipAuthenticate@1
displayName: 'Pip Authenticate'
inputs:
artifactFeeds: public/dotnet-public-pypi
onlyAddExtraIndex: false
Comment on lines 118 to 122
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed anymore.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Update: dotnet/dotnet#253


- script: $(sdkRoot)/eng/install-scancode.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is anything still using this file, can it be removed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I searched for the keyword "scancode" in the source build repository and found that only the license scan test is using this toolkit.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does that confirm that it can be removed with this PR?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that script file should be deleted.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought I had removed this file in the previous update to the PR, but it looks like I missed it. I 've now included the update: f18dd2f

displayName: Install Scancode

- script: >
$(Build.SourcesDirectory)/.dotnet/dotnet test
dotnet test
$(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.Tests/Microsoft.DotNet.SourceBuild.Tests.csproj
--filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.Tests.LicenseScanTests.ScanForLicenses"
--logger:'trx;LogFileName=$(Agent.JobName)_LicenseScan.trx'
Expand Down
Loading