Skip to content

Commit 99247e4

Browse files
github-actions[bot]dotnet-maestro[bot]edvilmeForgindNikolaMilosavljevic
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#47341)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eduardo Villalpando Mello <[email protected]> Co-authored-by: Forgind <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Nikola Milosavljevic <[email protected]> Co-authored-by: vseanreesermsft <[email protected]> Co-authored-by: v-wuzhai <[email protected]>
1 parent d8512e1 commit 99247e4

File tree

2 files changed

+28
-4
lines changed

2 files changed

+28
-4
lines changed

.github/workflows/pr-analysis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: PR Analysis
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, labeled, unlabeled]
5+
permissions:
6+
contents: read
7+
pull-requests: read
8+
jobs:
9+
allowed-labels:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Return error if branch is in lockdown or 'do not merge' label is present
13+
run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1
14+
if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }}

src/SourceBuild/content/eng/finish-source-only.proj

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,22 @@
114114
Outputs="$(BaseIntermediateOutputPath)ReportPoisonUsage.complete" >
115115
<ItemGroup>
116116
<!-- Exclude the Private.SourceBuilt.Artifacts archive from poison usage scan. -->
117-
<PoisonFileToCheck Include="$(ArtifactsAssetsDir)*$(ArchiveExtension)" />
118-
<PoisonFileToCheck Remove="$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName)*" />
117+
<AssetToCheck Include="$(ArtifactsAssetsDir)*$(ArchiveExtension)" />
118+
<AssetToCheck Remove="$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName)*" />
119119
<!-- Include shipping nuget packages. -->
120-
<PoisonFileToCheck Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
120+
<ShippingPackageToCheck Include="$(ArtifactsShippingPackagesDir)**/*.nupkg" />
121121
<!-- Add and mark SBRP packages to validate that they have the correct poison attribute. -->
122-
<PoisonFileToCheck Include="$(ReferencePackagesDir)**\*.nupkg" IsSourceBuildReferencePackage="true" />
122+
<SbrpPackageToCheck Include="$(ReferencePackagesDir)**\*.nupkg" IsSourceBuildReferencePackage="true" />
123+
</ItemGroup>
124+
125+
<Error Condition="'@(AssetToCheck)' == ''" Text="No assets will be poison checked - this is unexpected!" />
126+
<Error Condition="'@(ShippingPackageToCheck)' == ''" Text="No shipping packages will be poison checked - this is unexpected!" />
127+
<Error Condition="'@(SbrpPackageToCheck)' == ''" Text="No SBRP packages will be poison checked - this is unexpected!" />
128+
129+
<ItemGroup>
130+
<PoisonFileToCheck Include="@(AssetToCheck)" />
131+
<PoisonFileToCheck Include="@(ShippingPackageToCheck)" />
132+
<PoisonFileToCheck Include="@(SbrpPackageToCheck)" />
123133
</ItemGroup>
124134

125135
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Checking @(PoisonFileToCheck) for poisoned files." />

0 commit comments

Comments
 (0)