-
-
Notifications
You must be signed in to change notification settings - Fork 15.1k
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
tests.trivial-builders.references: refactor and move expressions into trivial-builders/test/references #204462
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
c0656e5
to
fc1ace9
Compare
fc1ace9
to
3e1a03a
Compare
3e1a03a
to
651bde4
Compare
651bde4
to
fd642aa
Compare
fd642aa
to
6f30a85
Compare
Rebase onto the master branch. |
970ea94
to
6f30a85
Compare
13 tasks
6f30a85
to
5eb116d
Compare
0762372
to
0a17a0b
Compare
lib
from pkgs
0a17a0b
to
b331946
Compare
Define package `testScriptBin` that contains the substituted test script. * Add an `installCheckPhase` to check the result script with ShellCheck. * Passthru as `references.testScriptBin` to run the (substituted) test script directly (without VM). * Drop the logic in build script that detects if it is run in the Nix sandbox. * Inline sample application; drop invoke-*.nix. Format expressions. * Format with `nixpkgs-fmt`. * Use multi-line style of set patterns. Call the samples with `callPackage`. * Rename `sample` -> `samples`. * Take individual packages / build helpers directly from the set pattern. * Define `cleanSamples` to filter out overriders such as `<pkg>.override`. added by `callPackage`. Passthru samples and invocation results for easier debugging. * Passthru samples, references, directReferences * Provide tests.trivial-builders.writeStringReferencesToFile with such samples argument.
…builders/test/references/
b331946
to
9fba2b0
Compare
roberth
reviewed
Dec 9, 2023
roberth
approved these changes
Dec 9, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks alright!
…ll on non-Linux Please Nix CI (OfBorg) with empty set instead of null on non-linux platforms, where NixOS tests are not supported. Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
It works. Thanks! |
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
10.rebuild-darwin: 0
This PR does not cause any packages to rebuild on Darwin
10.rebuild-linux: 1-10
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Make a
testScriptBin
that contains the substituted test script.installCheckPhase
to check the result script with ShellCheck.references.testScriptBin
to run the (substituted) test script directly (without VM).Format expressions.
nixpkgs-fmt
.Call the
samples
withcallPackage
.sample
tosamples
.cleanSamples
to filter out overriders such as<pkg>.override
added bycallPackage
.Passthru samples and invocation results for easier debugging.
samples
,references
anddirectReferences
Move all the related files into directory
trivial-builders/test/reference
trivial-builders/test
directory cleaner, andsamples.nix
not ambiguous.callPackage ./references { }
instead ofcallPackaeg ./references.nix
intrivial-builders/test/default.nix
.tests.trivial-builders.writeStringReferencesToFile
Cc: @roberth
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes