Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.05] github-runner: 2.320.0 -> 2.321.0 #357402

Merged
merged 1 commit into from
Nov 26, 2024

Conversation

YorikSar
Copy link
Contributor

@YorikSar YorikSar commented Nov 19, 2024

Manual backport of #356300 to release-24.05.

Automatic backport failed to rebase change, because the package was in a different place in the tree back then.

  • 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.

* remove mentions of Node.js 16 which is not supported anymore
  see actions/runner#3503
* switch to .Net SDK 8
  see actions/runner#3500
* fix source path discovery in deterministic build: runtime assumes that
  the root of the project is `/_`, replace it with actual `/build/src`
  so that tests can find their data.

(cherry picked from commit db1d5cf)
Copy link
Contributor

@kfollesdal kfollesdal left a comment

Choose a reason for hiding this comment

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

Check cherry-picks fails

@YorikSar
Copy link
Contributor Author

@kfollesdal cherrypick check fails because deps.nix is in a different place in this branch. The same reason why automatic cherrypick failed here.

@kfollesdal
Copy link
Contributor

@YorikSar, apologies for my ignorance, but I'm not familiar with the automatic cherry-picks check. Are you saying it's expected to fail in this case?

@YorikSar
Copy link
Contributor Author

YorikSar commented Nov 20, 2024

@kfollesdal The logs end with:

Note this should not necessarily be treated as a hard fail, but a reviewer's attention should be drawn to it and github actions have no way of doing that but to raise a 'failure'

This is because the check verifies diff between master commit and release branch commit. In this case, the same file is in different places in master and this release branch, so it's in different places in the commit patches. That's why the check fails.

@wegank wegank added 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Nov 22, 2024
@leona-ya leona-ya merged commit cf8dc5c into NixOS:release-24.05 Nov 26, 2024
34 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants