mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-12-27 04:53:50 +03:00
upload all devshell inputs to the cache
This will also include attic, so we don't need to explicitly do this in `./bin/nix-build-and-cache` anymore, which is good because that script gets called a good number of times and doing that repeatedly was a bit of a waste.
This commit is contained in:
parent
d5a9c6ac32
commit
d411e9037c
2 changed files with 8 additions and 10 deletions
|
@ -36,6 +36,9 @@ ci:
|
||||||
stage: ci
|
stage: ci
|
||||||
image: nixos/nix:2.20.4
|
image: nixos/nix:2.20.4
|
||||||
script:
|
script:
|
||||||
|
# Cache the inputs required for the devShell
|
||||||
|
- ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation
|
||||||
|
|
||||||
- direnv exec . engage
|
- direnv exec . engage
|
||||||
cache:
|
cache:
|
||||||
key: nix
|
key: nix
|
||||||
|
|
|
@ -15,17 +15,12 @@ nix run --inputs-from . attic -- login \
|
||||||
https://nix.computer.surgery/conduit \
|
https://nix.computer.surgery/conduit \
|
||||||
"$ATTIC_TOKEN"
|
"$ATTIC_TOKEN"
|
||||||
|
|
||||||
push_args=(
|
# Push the target installable and its build dependencies
|
||||||
# Attic and its build dependencies
|
nix run --inputs-from . attic -- \
|
||||||
"$(nix path-info --inputs-from . attic)"
|
push \
|
||||||
"$(nix path-info --inputs-from . attic --derivation)"
|
conduit \
|
||||||
|
"$(nix path-info "$INSTALLABLE" --derivation)" \
|
||||||
# The target installable and its build dependencies
|
|
||||||
"$(nix path-info "$INSTALLABLE" --derivation)"
|
|
||||||
"$(nix path-info "$INSTALLABLE")"
|
"$(nix path-info "$INSTALLABLE")"
|
||||||
)
|
|
||||||
|
|
||||||
nix run --inputs-from . attic -- push conduit "${push_args[@]}"
|
|
||||||
else
|
else
|
||||||
echo "\$ATTIC_TOKEN is unset, skipping uploading to the binary cache"
|
echo "\$ATTIC_TOKEN is unset, skipping uploading to the binary cache"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue