Skip to content

[Backport release-24.11] nuget-to-json: fix silent error after curl update#390936

Merged
corngood merged 2 commits intorelease-24.11from
backport-390928-to-release-24.11
Mar 18, 2025
Merged

[Backport release-24.11] nuget-to-json: fix silent error after curl update#390936
corngood merged 2 commits intorelease-24.11from
backport-390928-to-release-24.11

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Mar 18, 2025

Bot-based backport to release-24.11, triggered by a label in #390928.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

(cherry picked from commit 2afe69aeebe6b6deb7de91f326b9149f608645ca)
(cherry picked from commit 5918547)
Fixes: #389194
(cherry picked from commit 7a36c0ef0b08e07afec4f5300956941db2945efa)
(cherry picked from commit 36721b0)
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 18, 2025
@GGG-KILLER GGG-KILLER added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Mar 18, 2025
Copy link
Contributor

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

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

I think the CI wants the commit messages to remove references to 2afe69aeebe6b6deb7de91f326b9149f608645ca and 7a36c0ef0b08e07afec4f5300956941db2945efa, as I guess these are the original commits that won't end up being merged anymore.

Probably fine either way, since github should keep those commits available for lookup even unmerged.

@GGG-KILLER
Copy link
Contributor

Looks like it isn't smart enough to pick the last commit hash in case a commit is cherry-picked multiple times. I chose to approve it anyways because I don't think that warrants blocking this PR, it's just a sanity check anyways.

@corngood corngood merged commit 6c8e4e4 into release-24.11 Mar 18, 2025
27 of 29 checks passed
@corngood corngood deleted the backport-390928-to-release-24.11 branch March 18, 2025 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants