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

Exclude packages from checksum generation #33722

Merged
merged 4 commits into from
Mar 19, 2020
Merged

Conversation

mmitche
Copy link
Member

@mmitche mmitche commented Mar 18, 2020

No description provided.

@Dotnet-GitSync-Bot
Copy link
Collaborator

I couldn't add an area label to this PR.

Checkout this page to find out which area owner to ping, or please add exactly one area label to help train me in the future.

@mmitche
Copy link
Member Author

mmitche commented Mar 18, 2020

<Target Name="CreateChecksums">
<ItemGroup>
<ArtifactsForGeneratingChecksums
Include="@(UploadToBlobStorageFile)"
Excldude="*.nupkg"
Copy link
Member

Choose a reason for hiding this comment

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

There is a typo in Exclude.

Suggested change
Excldude="*.nupkg"
Exclude="*.nupkg"

Copy link
Member

Choose a reason for hiding this comment

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

Should we include *.snupkg so that when/if we add them, they're excluded?

Copy link
Member

Choose a reason for hiding this comment

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

They won't be found by any of this by default, so nothing needs to be done to prevent that:

<DownloadedSymbolNupkgFile Include="$(DownloadDirectory)**\*.symbols.nupkg" />
<DownloadedNupkgFile
Include="$(DownloadDirectory)**\*.nupkg"
Exclude="@(DownloadedSymbolNupkgFile)" />

FWIW, I have concerns that snupkg doesn't meet dotnet/runtime requirements based on the spec last time I looked: dotnet/arcade#167 (comment).

<Target Name="CreateChecksums">
<ItemGroup>
<ArtifactsForGeneratingChecksums
Include="@(UploadToBlobStorageFile)"
Excldude="*.nupkg"
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this will work because the nupkgs aren't in the working dir. Maybe use a Condition on %(Extension) instead, or exclude @(DownloadedSymbolNupkgFile);@(DownloadedNupkgFile)?

Copy link
Member

Choose a reason for hiding this comment

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

Oh, this has actually already been done:

<!-- Add files that are not affected by filtering. -->
<UploadToBlobStorageFile
Include="@(DownloadedArtifactFile)"
Exclude="@(DownloadedSymbolNupkgFile);@(DownloadedNupkgFile)" />

This PR should be a no-op.

Copy link
Member Author

@mmitche mmitche Mar 18, 2020

Choose a reason for hiding this comment

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

Hrmm...that's odd then, because we're getting checksums for the blobs:

https://dev.azure.com/dnceng/internal/_build/results?buildId=563472&view=artifacts&type=publishedArtifacts

I'll dig deeper.

Copy link
Member

Choose a reason for hiding this comment

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

Oh, that's strange. Later in that file the nupkgs are added back in:

<UploadToBlobStorageFile Include="@(NupkgToPublishFile)" />

<UploadToBlobStorageFile Include="@(SymbolNupkgToPublishFile)" />

I don't know why we'd be doing that.

Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like it's the ultimate list of things to upload to the parepred artifacts location

@mmitche
Copy link
Member Author

mmitche commented Mar 18, 2020

Changed this around:

  • Remove additional UploadToBlobStorageFile items that are not needed
  • Remove PreparedArtifacts. It's not useful as the BAR upload tasks will do all the necessary upload.

@mmitche
Copy link
Member Author

mmitche commented Mar 18, 2020

@mmitche
Copy link
Member Author

mmitche commented Mar 19, 2020

Test official build passed and did the right thing, merging

@mmitche mmitche merged commit e47e7be into dotnet:master Mar 19, 2020
@ghost ghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants