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

Fix testers.hasPkgConfigModules version check #310535

Closed
wants to merge 3 commits into from

Conversation

roberth
Copy link
Member

@roberth roberth commented May 10, 2024

Description of changes

Fix a mistake I reviewed.

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@roberth
Copy link
Member Author

roberth commented May 10, 2024

@ofborg build tests.testers.hasPkgConfigModules

@OPNA2608
Copy link
Contributor

if [[ $notFound -eq 0 ]] && ([[ $versionMismatch -eq 0 ]] || [[ "$versionCheck" == false ]]); then
exit 0
fi

The "$versionCheck" == false check further down seems broken and might need some adjusting/removal as well.

@roberth
Copy link
Member Author

roberth commented May 10, 2024

@OPNA2608 you're right - that conditional never worked.
I've removed it, as the new conditional is sufficient.

@nbraud
Copy link
Contributor

nbraud commented May 12, 2024

To clarify, the goal is to handle derivations which do not have a version attribute?
Edit: re-read the o.g. bug report, issue is simply that versionCheck was ignored.

Copy link
Contributor

@nbraud nbraud left a comment

Choose a reason for hiding this comment

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

Seems more complex than necessary, see suggested alternative in #311069

@nbraud nbraud mentioned this pull request May 12, 2024
13 tasks
@roberth
Copy link
Member Author

roberth commented May 12, 2024

#311069 isn't quite ready yet because of a UX problem, but we should consider merging something because currently the tester doesn't behave as intended.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 22, 2024
@nbraud
Copy link
Contributor

nbraud commented May 26, 2024

#311069 was merged instead.

@nbraud nbraud closed this May 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants