From 4b31b1d8f99ce7feec8d9ea566eb7d2ded4f1f1c Mon Sep 17 00:00:00 2001 From: Tanay Parikh Date: Tue, 1 Feb 2022 13:03:07 -0800 Subject: [PATCH 1/3] Extend disable component governance for linux Extension of https://github.com/dotnet/aspnetcore/pull/39898 --- .azure/pipelines/jobs/default-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 46899dd8c334..8105499add61 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -138,6 +138,8 @@ jobs: - LC_ALL: 'en_US.UTF-8' - LANG: 'en_US.UTF-8' - LANGUAGE: 'en_US.UTF-8' + - ${{ if ne(parameters.disableComponentGovernance, '') }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}: - JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64 - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}: From 698fca15635e2338315275927ed3b09d7d24f91e Mon Sep 17 00:00:00 2001 From: Tanay Parikh Date: Tue, 1 Feb 2022 13:51:54 -0800 Subject: [PATCH 2/3] PR Feedback --- .azure/pipelines/jobs/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 8105499add61..35074f39e5b4 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -121,6 +121,8 @@ jobs: demands: ImageOverride -equals Build.Server.Amd64.VS2019 ${{ if ne(parameters.container, '') }}: container: ${{ parameters.container }} + ${{ if ne(parameters.disableComponentGovernance, '') }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} variables: - AgentOsName: ${{ parameters.agentOs }} - ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping @@ -138,8 +140,6 @@ jobs: - LC_ALL: 'en_US.UTF-8' - LANG: 'en_US.UTF-8' - LANGUAGE: 'en_US.UTF-8' - - ${{ if ne(parameters.disableComponentGovernance, '') }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}: - JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64 - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}: From facf44dd37e00378ad06fb759d6e7bd4d1e5d2de Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 11 Feb 2022 12:02:11 -0800 Subject: [PATCH 3/3] Update ci.yml --- .azure/pipelines/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index cb0b5ed8a62a..2e8a54414837 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -543,6 +543,7 @@ stages: $(_InternalRuntimeDownloadArgs) installNodeJs: false installJdk: false + disableComponentGovernance: true skipComponentGovernanceDetection: true artifacts: - name: Linux_musl_x64_Logs