Skip to content

[Backport release-25.05] workflows/check-cherry-picks: post review comments#412856

Merged
wolfgangwalther merged 6 commits intorelease-25.05from
backport-412068-to-release-25.05
Jun 1, 2025
Merged

[Backport release-25.05] workflows/check-cherry-picks: post review comments#412856
wolfgangwalther merged 6 commits intorelease-25.05from
backport-412068-to-release-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Jun 1, 2025

Bot-based backport to release-25.05, triggered by a label in #412068.

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

The command substitution style we recently switched to strips trailing
newlines, so we don't need to check for empty lines anymore.

(cherry picked from commit 4c345b2)
(cherry picked from commit 30600ac)
This way it's a bit more centralized and easier to extend.

(cherry picked from commit 6054a8f)
Instead of failing the job, the workflow will now post review comments
as "Request Changes". This makes the feedback more readily visible and
avoids having to merge despite a failing CI job. It is also a
pre-requisite to enable required status checks / required workflows in
the future.

Committers are asked to confirm the differences by explicitly dismissing
the generated review. After dismissal, the related review comment will
automatically be marked as "resolved".

The comments only report warnings and errors. Reviews are automatically
dismissed when they have been addressed by the author and no problems
remain. If problems remain, existing, still pending, review comments
will be updated. If the same problems had already been dismissed
earlier, no new review comment will be created either.

(cherry picked from commit 515b174)
GitHub comments have a length limit, so we can't just dump everything.
The 10k limit is arbitrary, but the assumption is that reviewing the
range-diff is not the sensible thing to do once it becomes a certain
size - reviewing the regular diff and treating the commit as "new" is
easier to do in that case. Thus, truncating should work out fine,
especially when the full range-diff is still available in the runner
log.

This could still end up in with an error, if a PR has multiple commits,
which all hit the limit. Let's get there first, before we try to fix
that hypothetical case, too.

(cherry picked from commit 856792f)
@github-actions github-actions bot added 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 4.workflow: backport This targets a stable branch 6.topic: policy discussion Discuss policies to work in and around Nixpkgs backport release-24.11 labels Jun 1, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 1, 2025
@wolfgangwalther wolfgangwalther merged commit b6759f0 into release-25.05 Jun 1, 2025
14 of 18 checks passed
@wolfgangwalther wolfgangwalther deleted the backport-412068-to-release-25.05 branch June 1, 2025 07:48
@nixpkgs-ci
Copy link
Contributor Author

nixpkgs-ci bot commented Jun 1, 2025

Successfully created backport PR for release-24.11:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant