Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable component governance in Linux_musl_x64_build #39898

Merged
merged 1 commit into from
Feb 1, 2022

Conversation

captainsafia
Copy link
Member

Address issues with CG no longer respecting the skipComponentGovernanceDetection flag...

@captainsafia captainsafia requested a review from a team as a code owner January 31, 2022 22:17
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jan 31, 2022
@@ -520,6 +520,7 @@ stages:
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
disableComponentGovernance: true
skipComponentGovernanceDetection: true
Copy link
Member

Choose a reason for hiding this comment

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

do we still need skipComponentGovernanceDetection and the GC_RAN build step in default-build.yml❔

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 adopted a "if it ain't broke don't fix it mentality here". It appears to me that if disableComponentGovernance and skipComponentGovernanceDetection are set to the same value, then the same behavior will persist.

@captainsafia captainsafia merged commit 2802fa8 into main Feb 1, 2022
@captainsafia captainsafia deleted the safia/disable-cg branch February 1, 2022 00:39
@ghost ghost added this to the 7.0-preview2 milestone Feb 1, 2022
TanayParikh added a commit that referenced this pull request Feb 1, 2022
TanayParikh added a commit that referenced this pull request Feb 1, 2022
@wtgodbe
Copy link
Member

wtgodbe commented Feb 11, 2022

/backport to release/6.0

@github-actions
Copy link
Contributor

Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1831254967

@github-actions
Copy link
Contributor

@wtgodbe backporting to release/6.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Disable component governance in Linux_musl_x64_build
Using index info to reconstruct a base tree...
M	.azure/pipelines/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .azure/pipelines/ci.yml
CONFLICT (content): Merge conflict in .azure/pipelines/ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Disable component governance in Linux_musl_x64_build
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions bot pushed a commit that referenced this pull request Feb 11, 2022
wtgodbe added a commit that referenced this pull request Feb 11, 2022
* Extend disable component governance for linux

Extension of #39898

* PR Feedback

* Update ci.yml

Co-authored-by: Tanay Parikh <TanayParikh@users.noreply.github.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants