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

mir: Fix tests #310091

Merged
merged 1 commit into from
May 11, 2024
Merged

mir: Fix tests #310091

merged 1 commit into from
May 11, 2024

Conversation

OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented May 8, 2024

Description of changes

Hangs due to missing gobject-introspection: https://hydra.nixos.org/build/258221353

Tested by building: mir, miriway.passthru.tests, lomiri.qtmir, lomiri.lomiri.passthru.tests

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.

Copy link
Member

@wineee wineee left a comment

Choose a reason for hiding this comment

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

2 version mismatches:
❌ pkg-config module miral exists and has version 4.0.0 when 2.15.0 was expected
❌ pkg-config module miroil exists and has version 3.0.0 when 2.15.0 was expected
https://logs.ofborg.org/?key=nixos/nixpkgs.310091&attempt_id=f267fb0c-d7cf-4beb-b2bd-1a22e34654bd

(though it is not the responsibility of this pr)

@OPNA2608
Copy link
Contributor Author

OPNA2608 commented May 8, 2024

MirAL & MirOil use separate versions, they're not supposed to match the main one. Unfortunately, the option to opt out of this version check seems broken. 🙁

#307770, CC @nbraud

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

If one opts into making this a fatal mismatch with versionCheck = true, then $versionCheck == 1. Otherwise (which is the default), $versionCheck is empty. So this check never works correctly AFAICT, and it's always enforced.

Tested by adding

echo "versionCheck is: $versionCheck"

right before the if.

versionCheck = true: versionCheck is: 1
versionCheck = false: versionCheck is:

@wineee wineee merged commit 99684f8 into NixOS:master May 11, 2024
28 checks passed
@wineee
Copy link
Member

wineee commented May 11, 2024

mir.passthru.tests can be fixed later

@nbraud
Copy link
Contributor

nbraud commented May 12, 2024

The pkg-config test should be fixed once either #310535 or #311069 are merged. Sorry for the breakage 😓

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.

4 participants