Fix Merge Errors from #25401 and Internal 33077 #25478
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jshigetomi
added
the
CL-BuildPackaging
TravisEz13
approved these changes
Apr 28, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR fixes merge errors in the pipeline templates by updating a NuGet publish condition and cleaning up an unused variable in a blob storage script.
- Updated the condition in release-githubNuget.yml to properly check the skipPublish parameter.
- Removed the unused $prefix variable in release-MakeBlobPublic.yml, however its usage remains in the blob retrieval command.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| .pipelines/templates/release-githubNuget.yml | Updated the condition for NuGet publishing to align with intended behavior. |
| .pipelines/templates/release-MakeBlobPublic.yml | Removed the unused variable but did not remove its subsequent usage. |
Comments suppressed due to low confidence (1)
.pipelines/templates/release-MakeBlobPublic.yml:163
- The removed $prefix variable is still being referenced when retrieving blobs, which will lead to runtime errors. Either reintroduce the variable or remove its usage.
$blobs = Get-AzStorageBlob -Context $sourceContext -Container $sourceContainerName -Prefix $prefix
|
/azp run PowerShell-CI-linux-packaging, PowerShell-Windows-Packaging-CI |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
jshigetomi
changed the title
|
📣 Hey @@jshigetomi, how did we do? We would love to hear your feedback with the link below! 🗣️ 🔗 https://aka.ms/PSRepoFeedback |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Summary
This pull request includes updates to pipeline templates to fix a condition for publishing NuGet packages and remove an unused variable in a blob storage operation. These changes improve the correctness and maintainability of the release pipeline scripts.
Pipeline Condition Fixes:
.pipelines/templates/release-githubNuget.yml: Updated the condition for publishing NuGet packages to correctly check if theskipPublishparameter is set totrueinstead offalse. This ensures the condition aligns with the intended behavior.Code Cleanup:
.pipelines/templates/release-MakeBlobPublic.yml: Removed the unused$prefixvariable in the blob storage operation script, improving code clarity and maintainability.PR Context
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright header