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

glances: update to unstable 4.0.8 to fix tests on aarch64 #318070

Merged
merged 1 commit into from
Jun 21, 2024

Conversation

gador
Copy link
Member

@gador gador commented Jun 7, 2024

Description of changes

Test 105 and 107 fail on aarch64.
See upstream issue on nicolargo/glances#2819 and https://hydra.nixos.org/build/262259380/log

This PR fetches upstreams fix.

Just pulling in the commit did not fix the issue for version 4.0.7. Also version 4.0.8 fails to build with just the upstream fix.
It seems there are a number of changes in the test framework between 4.0.8 and the commit which fixes the issue (nicolargo/glances@051006e). So updateing to this specific commit is easier than pulling in several intermedate commits.

Release notes for 4.0.8: https://github.com/nicolargo/glances/releases/tag/v4.0.8

Maintainers:
@jonringer @primeos @k0ral

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@gador
Copy link
Member Author

gador commented Jun 7, 2024

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).

Result of nixpkgs-review pr 318070 run on x86_64-linux 1

EDIT: Nothing to build, since it doesn't change x86_64-linux

@gador
Copy link
Member Author

gador commented Jun 7, 2024

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).

Result of nixpkgs-review pr 318070 run on aarch64-linux 1

2 packages built:
  • glances
  • glances.dist

@gador
Copy link
Member Author

gador commented Jun 7, 2024

Result of nixpkgs-review pr 318070 run on aarch64-darwin 1

2 packages built:
  • glances
  • glances.dist

@Luflosi
Copy link
Contributor

Luflosi commented Jun 12, 2024

Since this seems to be fixed upstream now, how difficult would it be to cherry-pick the relevant commits instead?

@gador
Copy link
Member Author

gador commented Jun 12, 2024

@Luflosi relatively easy. I'll revise this PR probably tomorrow

@gador gador force-pushed the glances-disable-aarch64-tests branch from d3600a6 to c8b26ff Compare June 18, 2024 08:38
@gador gador changed the title glances: disable tests on aarch64 glances: fetch upstream patch to fix broken tests Jun 18, 2024
test 105 and 107 failed on aarch64. Upstream fixes those but
cherry-picking would require pulling in many different commits, so
updating to this unstable relase is cleaner.

See upstream issue on nicolargo/glances#2819

Signed-off-by: Florian Brandes <[email protected]>
@gador gador force-pushed the glances-disable-aarch64-tests branch from c8b26ff to 22ef149 Compare June 18, 2024 08:54
@gador gador changed the title glances: fetch upstream patch to fix broken tests glances: update to unstable 4.0.8 to fix tests on aarch64 Jun 18, 2024
@gador
Copy link
Member Author

gador commented Jun 18, 2024

Since this seems to be fixed upstream now, how difficult would it be to cherry-pick the relevant commits instead?

It seemed this was more work than anticipated. It is not enough to just pull in the upstream patch (see revised PR description), but should work now without issues on all tested systems.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4110

Copy link
Contributor

@Luflosi Luflosi left a comment

Choose a reason for hiding this comment

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

LGTM.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

Runs for me

https://github.com/NixOS/nixpkgs/pull/318070

2 packages built:
glances glances.dist

@jonringer
Copy link
Contributor

Thanks @gador

@jonringer jonringer merged commit 3ed0e68 into NixOS:master Jun 21, 2024
33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants