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-23.11] jellyfin, jellyfin-web: 10.9.1 -> 10.9.3, 10.9.2 -> 10.9.3 #315288

Conversation

minijackson
Copy link
Member

@minijackson minijackson commented May 28, 2024

Description of changes

Backport of #314775

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Nanotwerp added 3 commits May 28, 2024 09:13
The `default.nix` was also formatted with `nixfmt-rfc-style` to be `RFC 166`-compliant.

(cherry picked from commit a7441fe)
(cherry picked from commit 5cd7bbe)
@minijackson
Copy link
Member Author

Result of nixpkgs-review run on x86_64-linux 1

3 packages built:
  • jellyfin
  • jellyfin-media-player
  • jellyfin-web

@minijackson minijackson changed the title Backport 314775 to release 23.11 [Backport release-23.11] Backport 314775 to release 23.11 May 28, 2024
@minijackson minijackson changed the title [Backport release-23.11] Backport 314775 to release 23.11 [Backport release-23.11] jellyfin, jellyfin-web: 10.9.1 -> 10.9.3, 10.9.2 -> 10.9.3 May 28, 2024
@ofborg ofborg bot requested review from nyanloutre, purcell and jojosch May 28, 2024 08:45
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels May 28, 2024
@doronbehar
Copy link
Contributor

CI isn't green, not sure why...

@minijackson
Copy link
Member Author

Not sure why it fails on darwin, also…

@scaredmushroom
Copy link

scaredmushroom commented May 30, 2024

The failure is due to a note thrown inside the test:

2024-05-28T08:00:49.1667448Z ##[warning]Difference between e67051c92aebf9acd7522dd346e3a713544d4457 and original a7441feb23f2ba370fb3ae130f51113c5c72b8f2 may warrant inspection:
2024-05-28T08:00:49.1718261Z �[31m1:  a7441feb23f2 �[m�[33m!�[m�[32m 1:  e67051c92aeb�[m�[33m jellyfin: 10.9.1 -> 10.9.3�[m
2024-05-28T08:00:49.1719095Z     �[7m�[36m@@�[m �[mCommit message�[m
2024-05-28T08:00:49.1719549Z      �[m
2024-05-28T08:00:49.1720131Z          The `default.nix` was also formatted with `nixfmt-rfc-style` to be `RFC 166`-compliant.�[m
2024-05-28T08:00:49.1720848Z      �[m
2024-05-28T08:00:49.1721498Z     �[7m�[32m+�[m�[1m    (cherry picked from commit a7441feb23f2ba370fb3ae130f51113c5c72b8f2)�[m
2024-05-28T08:00:49.1722271Z     �[7m�[32m+�[m
2024-05-28T08:00:49.1732078Z       ## pkgs/servers/jellyfin/default.nix ##�[m
2024-05-28T08:00:49.1732732Z     �[36m @@�[m
2024-05-28T08:00:49.1733050Z     �[31m -{ lib�[m
2024-05-28T08:00:49.1733874Z     �[31m -, fetchFromGitHub�[m
2024-05-28T08:00:49.1734315Z     �[7m�[32m+�[m�[1;31m-, fetchurl�[m
2024-05-28T08:00:49.1734713Z     �[31m -, nixosTests�[m
2024-05-28T08:00:49.1735201Z     �[31m -, stdenv�[m
2024-05-28T08:00:49.1735614Z     �[31m -, dotnetCorePackages�[m
2024-05-28T08:00:49.1736207Z     �[7m�[36m@@�[m �[mpkgs/servers/jellyfin/default.nix: buildDotnetModule rec {�[m
2024-05-28T08:00:49.1736907Z     �[32m +      purcell�[m
2024-05-28T08:00:49.1737295Z     �[32m +      jojosch�[m
2024-05-28T08:00:49.1737640Z     �[32m +    ];�[m
2024-05-28T08:00:49.1738175Z     �[7m�[31m-�[m�[2m     mainProgram = "jellyfin";�[m
2024-05-28T08:00:49.1738740Z     �[7m�[32m+�[m�[1;32m+    mainProgram = "jellyfin";�[m
2024-05-28T08:00:49.1739569Z           platforms = dotnet-runtime.meta.platforms;�[m
2024-05-28T08:00:49.1740182Z         };�[m
2024-05-28T08:00:49.1740525Z     �[7m�[32m+�[m�[1m }�[m
2024-05-28T08:00:49.1741552Z 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'
[…]
2024-05-28T08:00:50.5631838Z ##[error]Process completed with exit code 1.
2024-05-28T08:00:50.5735042Z Post job cleanup.

Please check for yourself by opening the details of the check and than opening the raw log (cogwheel on the right upper side > "View raw logs"), but it seems to be fine?! Dunno how to let it pass though.

@minijackson
Copy link
Member Author

I was more talking about why jellyfin doesn't build on darwin, more than the backport action. I know that the backport action fails because I had to fix a merge conflict during the cherry-pick.

@minijackson
Copy link
Member Author

@reckenrode can I ask for your help on this?

@reckenrode
Copy link
Contributor

reckenrode commented Jun 2, 2024

Something seems to be going wrong with the regex source generator. According to the log message, the regex is invalid. I don’t know why it would be failing on Darwin when it’s being accepted on Linux. The code isn’t platform-specific.

@wegank
Copy link
Member

wegank commented Jun 30, 2024

As NixOS 23.11 reaches end-of-life today, this PR is closed as part of the EOL cleanup.

@wegank wegank closed this Jun 30, 2024
@minijackson minijackson deleted the backport-314775-to-release-23.11 branch July 31, 2024 06: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 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants