-
-
Notifications
You must be signed in to change notification settings - Fork 310
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
Improve UX with CA derivations #875
Open
thufschmitt
wants to merge
82
commits into
NixOS:master
Choose a base branch
from
thufschmitt:nix-ca
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit
Hold shift + click to select a range
00c2e2c
Fix with ca derivations
thufschmitt 030d72e
Add some tests for the content-addressed derivations
thufschmitt 111abeb
Properly register the unresolved derivation
thufschmitt 22a638e
Fix a localStore/destStore confusion
thufschmitt ddfece5
Check for previous builds using the drvPath rather than the output paths
thufschmitt fad8839
Don't call queryPartialDerivationOutputMap on the dest store
thufschmitt 410d7a0
getBuildOutput: Don't query the dest store for the outputs
thufschmitt 68d18b2
Correctly handle the non-ca case when building
thufschmitt af8f070
Allow gc-ing the destination store
thufschmitt 70402e5
Actually use the `content-addressed` test
thufschmitt d1e41cf
Update the ca test
thufschmitt c5a092e
Clarify what happens with the out paths in the db
thufschmitt d243424
Move mkDerivation-for-ca to config.nix.in
thufschmitt 4a6a342
eval-jobs: Don't strip the output path for ia derivations
thufschmitt 89a55b9
Add the output paths of CA derivations to the database
thufschmitt 34aaa0b
Add more ca tests
thufschmitt 2a2aa72
Test evaluating a ca drv without the experimental feature
thufschmitt a07b1db
Move the ca tests to a subdirectory
thufschmitt 3d64cfb
Fix a potential queue-runner crash
thufschmitt 9f2b576
Prevent enabling ca-derivations from breaking substitution
thufschmitt a79afe0
Document the state of ca derivations
thufschmitt f676dc8
Also register the ca outputs on the dest store
thufschmitt 79e5e73
Fix the resolving of derivations
thufschmitt 529c28f
Make non-ca-depending-on-ca derivations work
thufschmitt c6005f4
Correctly handle “real” input-addressed derivations
thufschmitt 1036075
Make perlcritic happy
thufschmitt a084efc
Extract some parts of `State::buildRemote` into auxiliary functions
thufschmitt 46ae574
Fix build with Nix 2.6pre
thufschmitt cdff806
Flake: Update
thufschmitt 77df6b4
Merge remote-tracking branch 'thufschmitt/nix-ca' into nix-ca4
aciceri 8b34b2f
Don't query outputs in case of CA derivations
aciceri d8639ac
Using new libstore method and fixes due to CA derivations
aciceri de2fc58
`string` -> `std::string`
aciceri 0ef435e
Forgot to remove old comment in the merge
aciceri db89bbe
Fixed regression to #1126
aciceri 8d52640
DB model changed
aciceri 954e41f
Keep track if step build outputs are CA or not
aciceri 3fdc9e4
Improved UI to correctly handle CA derivations
aciceri 391ada9
"Content addressed" field in builds details
aciceri 8311b49
Merge branch 'NixOS:master' into aciceri/ca-derivations
aciceri a9f1bc4
Merge remote-tracking branch 'upstream/master' into ca-derivations-re…
SuperSandro2000 d549a17
Fix compilation against Nix 2.16 and 2.17: ca-derivations followup
t184256 d1c1eaa
Copy the derivation input closure to the remote builder and the deriv…
DarkKirb b4dd816
require buildoutputs to be present before displaying it
DarkKirb c257abe
make it work
DarkKirb 9e528b2
Add realisations to binary cache for ca-derivations
SuperSandro2000 02e3537
Merge commit 'f216bce0e62654ab4809003ec0756ee3e40d5172' into ca-deriv…
Ericson2314 82ded22
Merge commit '4dc8fe0b08edc421c251270ccd4be3e5bf9d66b4' into ca-deriv…
Ericson2314 91cdfe5
Merge commit '874fcae1e895c0884f3694e2f5ec1749cb23e5d6' into ca-deriv…
Ericson2314 a0e854b
Merge remote-tracking branch 'upstream/master' into ca-derivations
Ericson2314 040d734
Restore accidentally deleted blank line
Ericson2314 5357d88
Remove stray whitespace in test
Ericson2314 3b3050c
Forgot to remove this duplicated code
Ericson2314 972f995
Style, indenting
Ericson2314 513f584
Two more style nits
Ericson2314 96eaec0
Merge branch 'ca-derivations-prep' into nix-ca
Ericson2314 32f34e2
Merge branch 'ca-derivations-prep' into nix-ca
Ericson2314 30c0619
Fix indentation
Ericson2314 897a921
Merge branch 'ca-derivations-prep' into nix-ca
Ericson2314 5b5f295
Merge branch 'ca-derivations-prep' into nix-ca
Ericson2314 049f608
Revert "Do not copy for both stores for now"
Ericson2314 4ba5179
Merge remote-tracking branch 'upstream/master' into nix-ca
Ericson2314 b755784
Tighten logic in build success case
Ericson2314 7128f39
Clean up for loop slightly
Ericson2314 ea0f14d
Simplify build-remote logic a little bit
Ericson2314 9c6c5ec
Clean up `queue-monitor.cc` a bit
Ericson2314 2359db8
flake.lock: Update to include unrelease 2.19 backports
Ericson2314 0b36532
Use `destStore` realisations to resolve CA derivations
Ericson2314 17c8d51
Don't write things to the local store that don't belong
Ericson2314 7d7a2a3
Beef of content addressing test
Ericson2314 ba70b4e
Merge branch 'ca-derivations-prep' into nix-ca
Ericson2314 25a5e4e
Merge branch 'ca-derivations-prep' into nix-ca
Ericson2314 bfe3567
Revert "Revert query -- those columns don't exist yet!"
Ericson2314 7f3e2c8
Merge branch 'ca-derivations-prep' into nix-ca
Ericson2314 002a77a
Merge branch 'master' into nix-ca
Ericson2314 0b632ec
Merge branch 'master' into nix-ca
Ericson2314 ee6c465
Merge branch 'master' into nix-ca
Ericson2314 c87a066
Merge branch 'ca-no-new-col' into nix-ca
Ericson2314 91c641d
Merge branch 'ca-no-new-col' into nix-ca
Ericson2314 2b1d277
Fix mistake in merge
Ericson2314 d7e7bee
Merge branch 'master' into nix-ca
Ericson2314 b207f20
Merge remote-tracking branch 'upstream/master' into nix-ca
Ericson2314 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#! /bin/sh | ||
|
||
# Workaround for https://github.com/NixOS/nix/pull/6051 | ||
echo "some output" | ||
|
||
mkdir $out | ||
echo foo > $out/a-file |
Oops, something went wrong.
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.
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.
If I read upstream correctly, this workaround shouldn't be needed anymore.