From 7721330f7171a5d379cfba99bf9df99f9ece8a4a Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Fri, 22 Mar 2019 18:39:05 -0700 Subject: [PATCH 1/2] Attempt to add Component Governance. --- Extension/jobs/build.windows.yml | 4 ++++ Extension/jobs/build.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Extension/jobs/build.windows.yml b/Extension/jobs/build.windows.yml index 662c72a11..f8b49c0c0 100644 --- a/Extension/jobs/build.windows.yml +++ b/Extension/jobs/build.windows.yml @@ -13,6 +13,10 @@ jobs: inputs: versionSpec: 8.x + - task: ComponentGovernanceComponentDetection@0 + displayName: 'Component Detection' + condition: ne(variables['System.PullRequest.IsFork'], 'True') + - script: npm install displayName: "Install Dependencies" workingDirectory: '$(Build.SourcesDirectory)\Extension' diff --git a/Extension/jobs/build.yml b/Extension/jobs/build.yml index 905777acb..065f3f4ce 100644 --- a/Extension/jobs/build.yml +++ b/Extension/jobs/build.yml @@ -11,6 +11,10 @@ jobs: displayName: 'Use Node 8.x' inputs: versionSpec: 8.x + + - task: ComponentGovernanceComponentDetection@0 + displayName: 'Component Detection' + condition: ne(variables['System.PullRequest.IsFork'], 'True') - script: npm install displayName: "Install Dependencies" From cea45f7386d3d3cd3e888c30cf3b5b593f656f83 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Fri, 22 Mar 2019 18:46:16 -0700 Subject: [PATCH 2/2] Change it. --- Extension/jobs/build.windows.yml | 10 +++++----- Extension/jobs/build.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Extension/jobs/build.windows.yml b/Extension/jobs/build.windows.yml index f8b49c0c0..829c4a40c 100644 --- a/Extension/jobs/build.windows.yml +++ b/Extension/jobs/build.windows.yml @@ -13,10 +13,6 @@ jobs: inputs: versionSpec: 8.x - - task: ComponentGovernanceComponentDetection@0 - displayName: 'Component Detection' - condition: ne(variables['System.PullRequest.IsFork'], 'True') - - script: npm install displayName: "Install Dependencies" workingDirectory: '$(Build.SourcesDirectory)\Extension' @@ -59,4 +55,8 @@ jobs: CODE_TESTS_PATH: '$(Build.SourcesDirectory)\Extension\out\test\integrationTests\languageServer' CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)\Extension' CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)\Extension\test\integrationTests\testAssets\SimpleCppProject' - CODE_DISABLE_EXTENSIONS: 1 \ No newline at end of file + CODE_DISABLE_EXTENSIONS: 1 + +- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 + displayName: 'Component Detection' + continueOnError: true \ No newline at end of file diff --git a/Extension/jobs/build.yml b/Extension/jobs/build.yml index 065f3f4ce..44a31a7a5 100644 --- a/Extension/jobs/build.yml +++ b/Extension/jobs/build.yml @@ -11,10 +11,6 @@ jobs: displayName: 'Use Node 8.x' inputs: versionSpec: 8.x - - - task: ComponentGovernanceComponentDetection@0 - displayName: 'Component Detection' - condition: ne(variables['System.PullRequest.IsFork'], 'True') - script: npm install displayName: "Install Dependencies" @@ -68,4 +64,8 @@ jobs: CODE_TESTS_PATH: '$(Build.SourcesDirectory)/Extension/out/test/integrationTests/languageServer' CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)/Extension' CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)/Extension/test/integrationTests/testAssets/SimpleCppProject' - CODE_DISABLE_EXTENSIONS: 1 \ No newline at end of file + CODE_DISABLE_EXTENSIONS: 1 + +- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 + displayName: 'Component Detection' + continueOnError: true \ No newline at end of file