Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Fix Merge Errors from #25401 and Internal 33077 #25478

Merged
jshigetomi merged 1 commit into
release/v7.4PowerShell/PowerShell:release/v7.4from
fixMergeErrorsPowerShell/PowerShell:fixMergeErrorsCopy head branch name to clipboard
Apr 28, 2025
Merged

Fix Merge Errors from #25401 and Internal 33077 #25478
jshigetomi merged 1 commit into
release/v7.4PowerShell/PowerShell:release/v7.4from
fixMergeErrorsPowerShell/PowerShell:fixMergeErrorsCopy head branch name to clipboard

Conversation

@jshigetomi

@jshigetomi jshigetomi commented Apr 28, 2025

Copy link
Copy Markdown
Collaborator

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 the skipPublish parameter is set to true instead of false. This ensures the condition aligns with the intended behavior.

Code Cleanup:

PR Context

PR Checklist

@jshigetomi jshigetomi marked this pull request as ready for review April 28, 2025 22:36
@jshigetomi jshigetomi requested a review from a team as a code owner April 28, 2025 22:36
@jshigetomi jshigetomi added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label Apr 28, 2025
@TravisEz13 TravisEz13 requested a review from Copilot April 28, 2025 22:41

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

@TravisEz13

Copy link
Copy Markdown
Member

/azp run PowerShell-CI-linux-packaging, PowerShell-Windows-Packaging-CI

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@jshigetomi jshigetomi changed the title Fix Merge Errors Fix Merge Errors in #25475 Apr 28, 2025
@jshigetomi jshigetomi changed the title Fix Merge Errors in #25475 Fix Merge Errors from #25401 and Internal 33077 Apr 28, 2025
@jshigetomi jshigetomi merged commit 63f42af into release/v7.4 Apr 28, 2025
41 of 42 checks passed
@microsoft-github-policy-service

microsoft-github-policy-service Bot commented Apr 28, 2025

Copy link
Copy Markdown
Contributor

📣 Hey @@jshigetomi, how did we do? We would love to hear your feedback with the link below! 🗣️

🔗 https://aka.ms/PSRepoFeedback

@jshigetomi jshigetomi deleted the fixMergeErrors branch June 17, 2025 02:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.