Add an approval for releasing build-info json by adityapatwardhan · Pull Request #16351 · PowerShell/PowerShell · GitHub
Skip to content

Add an approval for releasing build-info json#16351

Merged
TravisEz13 merged 1 commit intoPowerShell:masterfrom
adityapatwardhan:AddApprovalBuildJson
Nov 1, 2021
Merged

Add an approval for releasing build-info json#16351
TravisEz13 merged 1 commit intoPowerShell:masterfrom
adityapatwardhan:AddApprovalBuildJson

Conversation

@adityapatwardhan
Copy link
Copy Markdown
Member

@adityapatwardhan adityapatwardhan commented Nov 1, 2021

PR Summary

Add an approval check for releasing the build-info json

PR Context

PR Checklist

@pull-request-quantifier-deprecated
Copy link
Copy Markdown

@TravisEz13 TravisEz13 merged commit 3071718 into PowerShell:master Nov 1, 2021
@adityapatwardhan adityapatwardhan added Backport-7.2.x-Approved CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log Backport-7.2.x-Done and removed Backport-7.2.x-Consider labels Nov 1, 2021
@ghost
Copy link
Copy Markdown

ghost commented Nov 8, 2021

🎉v7.2.0 has been released which incorporates this pull request.:tada:

Handy links:

@ghost
Copy link
Copy Markdown

ghost commented Dec 16, 2021

🎉v7.3.0-preview.1 has been released which incorporates this pull request.:tada:

Handy links:

@TravisEz13
Copy link
Copy Markdown
Member

/backport to release/v7.0.11

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 4, 2022

Started backporting to release/v7.0.11: https://github.com/PowerShell/PowerShell/actions/runs/2271011076

GitHub
PowerShell for every system! Contribute to PowerShell/PowerShell development by creating an account on GitHub.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 4, 2022

@TravisEz13 backporting to release/v7.0.11 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Add an approval for releasing build-info json
Using index info to reconstruct a base tree...
M	tools/releaseBuild/azureDevOps/releasePipeline.yml
Falling back to patching base and 3-way merge...
Auto-merging tools/releaseBuild/azureDevOps/releasePipeline.yml
CONFLICT (content): Merge conflict in tools/releaseBuild/azureDevOps/releasePipeline.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add an approval for releasing build-info json
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

TravisEz13 pushed a commit that referenced this pull request May 9, 2022
# Conflicts:
#	tools/releaseBuild/azureDevOps/releasePipeline.yml
@ghost
Copy link
Copy Markdown

ghost commented May 17, 2022

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Backport-7.0.x-Done Backport-7.2.x-Done CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log Extra Small

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants