Skip to content

Fix ComponentGovernance running on public PR/CI jobs #99898

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.

Sign up for GitHub

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

Merged
akoeplinger merged 1 commit into from
Mar 18, 2024
Merged

Fix ComponentGovernance running on public PR/CI jobs #99898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion eng/pipelines/common/global-build-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ parameters:
preBuildSteps: []
enableRichCodeNavigation: false
richCodeNavigationLanguage: 'csharp'
disableComponentGovernance: false
disableComponentGovernance: ''

jobs:
- template: /eng/common/templates/job/job.yml
Expand Down
8 changes: 5 additions & 3 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ parameters:
timeoutInMinutes: ''
enableMicrobuild: ''
gatherAssetManifests: false
disableComponentGovernance: false
disableComponentGovernance: ''

variables: {} ## any extra variables to add to the defaults defined below

Expand Down Expand Up @@ -64,9 +64,11 @@ jobs:
${{ if eq(parameters.osGroup, 'windows') }}:
agentOs: windows

# Disable component governance if requested or on musl machines where it does not work well
${{ if or(eq(parameters.disableComponentGovernance, true), eq(parameters.osSubGroup, '_musl')) }}:
# Component governance does not work on musl machines
${{ if eq(parameters.osSubGroup, '_musl') }}:
disableComponentGovernance: true
${{ else }}:
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}

# Setting this results in the arcade job template including a step
# that gathers asset manifests and publishes them to pipeline
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/libraries/run-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
# To run the tests we just send to helix and wait, use ubuntu hosted pools for faster providing and to not back up our build pools
pool: ${{ parameters.pool }}

# Disable component governance if requested or on musl machines where it does not work well
${{ if or(eq(parameters.disableComponentGovernance, true), eq(parameters.osSubGroup, '_musl')) }}:
Copy link
Member Author

@akoeplinger akoeplinger Mar 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This .yml doesn't have a disableComponentGovernance parameter and nothing sets it so I removed the check

Copy link
Member

@jakobbotsch jakobbotsch Mar 18, 2024

Choose a reason for hiding this comment

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

Is that a result of the refactoring? I added a bunch of these in #84683 (though not to this file)

Copy link
Member Author

@akoeplinger akoeplinger Mar 18, 2024

Choose a reason for hiding this comment

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

I haven't checked but could be yeah.

# Component governance does not work on musl machines
${{ if eq(parameters.osSubGroup, '_musl') }}:
disableComponentGovernance: true

dependsOn:
Expand Down