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

imag: init at 0.10.1 #89016

Merged
merged 1 commit into from Aug 22, 2020
Merged

imag: init at 0.10.1 #89016

merged 1 commit into from Aug 22, 2020

Conversation

minijackson
Copy link
Member

Motivation for this change

Based on #77362 by @filalex77

As discussed there, the differences are:

  • Update to 0.10.1, which removes the Cargo.lock patch
  • Run the tests under a created PTY to make them pass
  • Install the shell completion scripts
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Br1ght0ne
Copy link
Member

Checking Darwin build.

@GrahamcOfBorg build imag

Co-authored-by: Oleksii Filonenko <brightone@protonmail.com>
@minijackson
Copy link
Member Author

Updated with the usage of installShellFiles (I didn't know about this hook, thanks!), and hopefully fixes the darwin build, which uses BSD-style script command.

Copy link
Member

@Br1ght0ne Br1ght0ne left a comment

Choose a reason for hiding this comment

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

diff LGTM
nixpkgs-review passed on NixOS 20.03

@Br1ght0ne
Copy link
Member

@GrahamcOfBorg build imag

@minijackson
Copy link
Member Author

The darwin build now passes, but I don't see the tests in the log...

@Br1ght0ne
Copy link
Member

Br1ght0ne commented May 27, 2020

@minijackson I think passthru.tests should be checked too.

@GrahamcOfBorg build imag.passthru.tests

@minijackson
Copy link
Member Author

@filalex77 Isn't passthru.tests usually for nixos modules tests?

I can see the tests in the linux build log, so I thought it was the BSD-style script that captured the output? Another point that bugs me is that I don't know if the script in the darwin build returns the same error code as the command it runs, so it's possible we might not see the darwin tests fail :-/

@Lassulus Lassulus merged commit d686e30 into NixOS:master Aug 22, 2020
@minijackson minijackson deleted the init-imag branch August 22, 2020 15:27
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

3 participants