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

Create workload pack group installers #9514

Merged
merged 11 commits into from
Jun 8, 2022
Merged

Conversation

dsplaisted
Copy link
Member

No description provided.

@dsplaisted dsplaisted requested a review from joeloff May 31, 2022 15:14

if (CreateWorkloadPackGroups)
{
// TODO: Support passing in data to skip creating pack groups for certain packs (possibly EMSDK, because it's large)
Copy link
Member

Choose a reason for hiding this comment

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

Does this mean EMSDK would merge its packs if they used this feature, so for now they just run with CreateWorkloadPackGroups=false?

Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we could consider a groupable property in the manifest files, or perhaps a groupId that can guide the tools. Another solution eventually would be to allow owners to pass in a set of items that contain pack IDs that can be grouped by the build task

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 was thinking that we would have a parameter which would be a list of packs not to group together. But if we only need it for Emscripten SDK, then maybe that's overkill and we should just use the CreateWorkloadPackGroups=false solution.

@@ -23,7 +23,7 @@ public void ItAssignsDefaultValues()
{
Copy link
Member

Choose a reason for hiding this comment

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

Can we add a test to verify the dependencies in the generated .swr when the packGroupId is passed?

candle.AddPreprocessorDefinition(PreprocessorDefinitionNames.PackageId, Package.Id);
candle.AddPreprocessorDefinition(PreprocessorDefinitionNames.PackageVersion, $"{Package.PackageVersion}");
candle.AddPreprocessorDefinition(PreprocessorDefinitionNames.PackageId, Metadata.Id);
candle.AddPreprocessorDefinition(PreprocessorDefinitionNames.PackageVersion, $"{Metadata.PackageVersion}");
candle.AddPreprocessorDefinition(PreprocessorDefinitionNames.Platform, Platform);
candle.AddPreprocessorDefinition(PreprocessorDefinitionNames.ProductCode, $"{Guid.NewGuid()}");
Copy link
Member

Choose a reason for hiding this comment

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

Can we fix the GUID here instead? That way anything else that use the variable now and in the future will have the same value. We can just change it to be {Guid.NewGuid():B}

@joeloff
Copy link
Member

joeloff commented Jun 8, 2022

We'll probably need @mmitche to help with the merge

@mmitche mmitche merged commit db6086c into release/6.0 Jun 8, 2022
joeloff pushed a commit to joeloff/arcade that referenced this pull request Aug 12, 2022
* Remove duplicate PackageReference

* Create MSIs for workoad pack groups

* Build NuGet wrapper packages for workload pack group MSIs

* Generate WorkloadPackGroups.json in manifest MSIs

* Add swix authoring for workload pack groups

* De-duplicate workload pack group creation

* Put braces around ProductCode and UpgradeCode registry values

* Write registry keys for pack groups

* Fix swix dependencies for pack groups

* Use correct GUID format when setting candle variables

* Add test for creating pack group dependency in SWR file
mmitche pushed a commit that referenced this pull request Aug 15, 2022
* Refactoring workload build tasks (#8645)

* Refactoring workload build tasks

* Fix source build and some random cleanup

* Updating tests, code cleanup

* Minor fixes, unit test conversion

* Mark tests as Windows only, fix missing content for Helix

* Hide WiX and test packages from Solution Explorer

* Fix duplicate publish items

* Fix link target for helix

* Fix link metadata for WiX

* Pass ICE suppressions to Light, more cleanup

* Fix file extraction for packs, add unit test for template pack MSI

* Pass ICE suppressions to Light (#9061)

* Create workload pack group installers (#9514)

* Remove duplicate PackageReference

* Create MSIs for workoad pack groups

* Build NuGet wrapper packages for workload pack group MSIs

* Generate WorkloadPackGroups.json in manifest MSIs

* Add swix authoring for workload pack groups

* De-duplicate workload pack group creation

* Put braces around ProductCode and UpgradeCode registry values

* Write registry keys for pack groups

* Fix swix dependencies for pack groups

* Use correct GUID format when setting candle variables

* Add test for creating pack group dependency in SWR file

* Support building with missing workload packs (#9628)

* Support building with missing workload packs

* Include extracted manifest files in manifest MSI payload nupkg

* Fix versioning errors in workloads (#10363)

* Fix versioning errors in workloads

* Disable TRX tests while reporting to AZDO is broken (#10358) (#10380)

Co-authored-by: Matt Galbraith <[email protected]>

* clean up, api changes

Co-authored-by: Daniel Plaisted <[email protected]>
Co-authored-by: Matt Galbraith <[email protected]>
@akoeplinger akoeplinger deleted the bundle-workload-packs branch November 22, 2022 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants