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

fish: fix aarch64-linux test failures #391150

Merged
merged 1 commit into from
Mar 19, 2025

Conversation

adamcstephens
Copy link
Contributor

@adamcstephens adamcstephens commented Mar 19, 2025

Apply upstream fix.

Previously #389895
Closes #390901
Fixed #389377
Upstream fish-shell/fish-shell#11254

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@adamcstephens adamcstephens changed the title fish: disable more tests on aarch64 fish: disable more tests on aarch64-linux Mar 19, 2025
@adamcstephens adamcstephens force-pushed the push-smxtztmrqupr branch 2 times, most recently from ca44308 to 9a2b863 Compare March 19, 2025 02:42
@adamcstephens adamcstephens requested review from r-vdp and GaetanLepage and removed request for r-vdp March 19, 2025 02:43
@adamcstephens adamcstephens changed the title fish: disable more tests on aarch64-linux fish: skip more tests on aarch64-linux Mar 19, 2025
@GaetanLepage

This comment was marked as outdated.

@r-vdp
Copy link
Contributor

r-vdp commented Mar 19, 2025

We could also try cherry-picking fish-shell/fish-shell@1d78c8b which seems like it may fix the issue.

Do we have a quick way to reproduce the issue so that we can test if that commit fixes the issue?

@adamcstephens
Copy link
Contributor Author

Do we have a quick way to reproduce the issue so that we can test if that commit fixes the issue?

Yes, I’ll test the patch today. I got access to the nix-community build machine yesterday and was able to reproduce the failures there. Still not 100% failures but a few clean runs there will be a good sign.

@adamcstephens adamcstephens marked this pull request as draft March 19, 2025 11:34
Parallel locale changes cause flaky tests on fast harder.
@adamcstephens adamcstephens changed the title fish: skip more tests on aarch64-linux fish: fix aarch64-linux test failures Mar 19, 2025
@adamcstephens adamcstephens marked this pull request as ready for review March 19, 2025 12:44
@adamcstephens
Copy link
Contributor Author

I just ran this three times without failure, so let's get it applied and keep an eye on the hydra builds.

@adamcstephens adamcstephens merged commit 8ce2819 into NixOS:master Mar 19, 2025
53 of 55 checks passed
@adamcstephens adamcstephens deleted the push-smxtztmrqupr branch March 19, 2025 14:20
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.

Build failure: fish Build failure: fish
4 participants