fix(scripts): Refactor cache uploading
All checks were successful
Check meta / check_meta (pull_request) Successful in 20s
Check meta / check_dns (pull_request) Successful in 20s
Check workflows / check_workflows (pull_request) Successful in 27s
Run pre-commit on all files / pre-commit (push) Successful in 40s
Build all the nodes / ap01 (pull_request) Successful in 1m13s
Build all the nodes / bridge01 (pull_request) Successful in 1m46s
Build all the nodes / geo01 (pull_request) Successful in 1m46s
Build all the nodes / geo02 (pull_request) Successful in 1m41s
Build all the nodes / compute01 (pull_request) Successful in 2m26s
Build all the nodes / hypervisor01 (pull_request) Successful in 1m33s
Build all the nodes / netcore02 (pull_request) Successful in 36s
Build all the nodes / hypervisor02 (pull_request) Successful in 1m37s
Build all the nodes / hypervisor03 (pull_request) Successful in 1m36s
Build all the nodes / rescue01 (pull_request) Successful in 2m5s
Build all the nodes / storage01 (pull_request) Successful in 2m4s
Build all the nodes / vault01 (pull_request) Successful in 1m57s
Build the shell / build-shell (pull_request) Successful in 35s
Build all the nodes / web02 (pull_request) Successful in 1m42s
Run pre-commit on all files / pre-commit (pull_request) Successful in 38s
Build all the nodes / web01 (pull_request) Successful in 2m21s
Build all the nodes / web03 (pull_request) Successful in 1m40s
All checks were successful
Check meta / check_meta (pull_request) Successful in 20s
Check meta / check_dns (pull_request) Successful in 20s
Check workflows / check_workflows (pull_request) Successful in 27s
Run pre-commit on all files / pre-commit (push) Successful in 40s
Build all the nodes / ap01 (pull_request) Successful in 1m13s
Build all the nodes / bridge01 (pull_request) Successful in 1m46s
Build all the nodes / geo01 (pull_request) Successful in 1m46s
Build all the nodes / geo02 (pull_request) Successful in 1m41s
Build all the nodes / compute01 (pull_request) Successful in 2m26s
Build all the nodes / hypervisor01 (pull_request) Successful in 1m33s
Build all the nodes / netcore02 (pull_request) Successful in 36s
Build all the nodes / hypervisor02 (pull_request) Successful in 1m37s
Build all the nodes / hypervisor03 (pull_request) Successful in 1m36s
Build all the nodes / rescue01 (pull_request) Successful in 2m5s
Build all the nodes / storage01 (pull_request) Successful in 2m4s
Build all the nodes / vault01 (pull_request) Successful in 1m57s
Build the shell / build-shell (pull_request) Successful in 35s
Build all the nodes / web02 (pull_request) Successful in 1m42s
Run pre-commit on all files / pre-commit (pull_request) Successful in 38s
Build all the nodes / web01 (pull_request) Successful in 2m21s
Build all the nodes / web03 (pull_request) Successful in 1m40s
This commit is contained in:
parent
2132ef08d9
commit
48a09de93a
7 changed files with 27 additions and 35 deletions
|
@ -8,7 +8,7 @@ jobs:
|
||||||
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
|
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
|
||||||
STORE_USER: admin
|
STORE_USER: admin
|
||||||
name: Build and cache shell
|
name: Build and cache shell
|
||||||
run: nix-shell -A eval-shell --run "nix-cache -A devShell"
|
run: nix-shell -A eval-shell --run "nix-instantiate-and-cache -A devShell"
|
||||||
name: Build the shell
|
name: Build the shell
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
|
@ -180,7 +180,7 @@ in
|
||||||
pre-commit.shellHook = git-checks.shellHook;
|
pre-commit.shellHook = git-checks.shellHook;
|
||||||
check-workflows.shellHook = workflows.shellHook;
|
check-workflows.shellHook = workflows.shellHook;
|
||||||
eval-nodes.packages = [ scripts.cache-node ];
|
eval-nodes.packages = [ scripts.cache-node ];
|
||||||
eval-shell.packages = [ scripts.nix-cache ];
|
eval-shell.packages = [ scripts.nix-instantiate-and-cache ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,23 +35,4 @@ esac
|
||||||
drv=$(colmena eval --instantiate -E "{ nodes, ... }: nodes.${BUILD_NODE}.${toplevel_path}" --show-trace)
|
drv=$(colmena eval --instantiate -E "{ nodes, ... }: nodes.${BUILD_NODE}.${toplevel_path}" --show-trace)
|
||||||
|
|
||||||
# Build the derivation and send it to the great beyond
|
# Build the derivation and send it to the great beyond
|
||||||
nix-store --query --requisites --force-realise --include-outputs "$drv" | grep -v '.*\.drv' >paths.txt
|
nix-cache "$drv"
|
||||||
|
|
||||||
if [ "$STORE_PASSWORD" == "" ]; then
|
|
||||||
echo "No password given for the remote cache, uploading cannot take place."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat <<EOF >.netrc
|
|
||||||
default
|
|
||||||
login $STORE_USER
|
|
||||||
password $STORE_PASSWORD
|
|
||||||
EOF
|
|
||||||
|
|
||||||
nix copy \
|
|
||||||
--extra-experimental-features nix-command \
|
|
||||||
--to "$STORE_ENDPOINT?compression=none" \
|
|
||||||
--netrc-file .netrc \
|
|
||||||
"$(nix-store --realise "$drv")"
|
|
||||||
|
|
||||||
rm .netrc
|
|
||||||
|
|
|
@ -20,8 +20,12 @@ let
|
||||||
;
|
;
|
||||||
|
|
||||||
scripts = {
|
scripts = {
|
||||||
cache-node = [ colmena ];
|
cache-node = [
|
||||||
nix-cache = [ colmena ];
|
colmena
|
||||||
|
self.nix-cache
|
||||||
|
];
|
||||||
|
nix-cache = [ ];
|
||||||
|
nix-instantiate-and-cache = [ self.nix-cache ];
|
||||||
check-deployment = [
|
check-deployment = [
|
||||||
colmena
|
colmena
|
||||||
jq
|
jq
|
||||||
|
@ -30,13 +34,14 @@ let
|
||||||
launch-vm = [ colmena ];
|
launch-vm = [ colmena ];
|
||||||
list-nodes = [ jq ];
|
list-nodes = [ jq ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
self = mapAttrs (
|
||||||
|
name: runtimeInputs:
|
||||||
|
writeShellApplication {
|
||||||
|
inherit name runtimeInputs;
|
||||||
|
|
||||||
|
text = builtins.readFile ./${name}.sh;
|
||||||
|
}
|
||||||
|
) scripts;
|
||||||
in
|
in
|
||||||
|
self
|
||||||
mapAttrs (
|
|
||||||
name: runtimeInputs:
|
|
||||||
writeShellApplication {
|
|
||||||
inherit name runtimeInputs;
|
|
||||||
|
|
||||||
text = builtins.readFile ./${name}.sh;
|
|
||||||
}
|
|
||||||
) scripts
|
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
|
|
||||||
# Build the derivation and send it to the great beyond
|
# Build the derivation and send it to the great beyond
|
||||||
|
|
||||||
drv=$(nix-instantiate "$@")
|
drv=$1
|
||||||
|
|
||||||
nix-store --query --requisites --force-realise --include-outputs "$drv" | grep -v '.*\.drv' > paths.txt
|
nix-store --query --requisites --force-realise --include-outputs "$drv" | grep -v '.*\.drv' > paths.txt
|
||||||
|
|
||||||
if [ "$STORE_PASSWORD" == "" ]; then
|
if [ "$STORE_PASSWORD" == "" ]; then
|
||||||
|
|
5
scripts/nix-instantiate-and-cache.sh
Normal file
5
scripts/nix-instantiate-and-cache.sh
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
# SPDX-FileCopyrightText: 2024 Maurice Debray <maurice@dgnum.eu>
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: EUPL-1.2
|
||||||
|
|
||||||
|
nix-cache "$(nix-instantiate "$@")"
|
|
@ -16,7 +16,7 @@
|
||||||
{ uses = "actions/checkout@v3"; }
|
{ uses = "actions/checkout@v3"; }
|
||||||
{
|
{
|
||||||
name = "Build and cache shell";
|
name = "Build and cache shell";
|
||||||
run = "nix-shell -A eval-shell --run \"nix-cache -A devShell\"";
|
run = "nix-shell -A eval-shell --run \"nix-instantiate-and-cache -A devShell\"";
|
||||||
env = {
|
env = {
|
||||||
STORE_ENDPOINT = "https://tvix-store.dgnum.eu/infra-signing/";
|
STORE_ENDPOINT = "https://tvix-store.dgnum.eu/infra-signing/";
|
||||||
STORE_USER = "admin";
|
STORE_USER = "admin";
|
||||||
|
|
Loading…
Reference in a new issue