kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix: gc not couple to cachix push

Browse source
This commit is contained in:
Kat Inskip 2024-07-14 09:14:10 -07:00
parent a4259bcbd0
commit 3bbd772495
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
packages/nf-build-system/build-system.sh
View file

@ -27,7 +27,7 @@ init_nfargs() {
if [[ -n "${NF_ACTIONS_TEST_OUTLINK-}" || -n "${NF_UPDATE_CACHIX_PUSH-}" ]]; then if [[ -n "${NF_ACTIONS_TEST_OUTLINK-}" || -n "${NF_UPDATE_CACHIX_PUSH-}" ]]; then
nfargs+=( nfargs+=(
-o "${NF_ACTIONS_TEST_OUTLINK-result}$nflinksuffix" -o "${NF_ACTIONS_TEST_OUTLINK-result}" "$nflinksuffix"
) )
else else
nfargs+=( nfargs+=(
@ -36,13 +36,16 @@ init_nfargs() {
fi fi
} }
nfgc() { perform_cachix_push() {
local nflinksuffix="-L"
if [[ -n ${NF_UPDATE_CACHIX_PUSH-} ]]; then
send_discord_message "Cachix pushing ${SYSTEM_TYPE} system build for ${ALIAS}"
cachix push kittywitch "./${NF_ACTIONS_TEST_OUTLINK-result}$nflinksuffix"*/
fi
}
perform_garbage_collection() {
if [[ -n ${NF_ACTIONS_TEST_GC-} ]]; then if [[ -n ${NF_ACTIONS_TEST_GC-} ]]; then
if [[ -n ${NF_UPDATE_CACHIX_PUSH-} ]]; then
send_discord_message "Cachix pushing ${SYSTEM_TYPE} system build for ${ALIAS}"
cachix push kittywitch "./${NF_ACTIONS_TEST_OUTLINK-result}$nflinksuffix"*/
rm -f "./${NF_ACTIONS_TEST_OUTLINK-result}$nflinksuffix"*
fi
nix-collect-garbage -d nix-collect-garbage -d
fi fi
} }
@ -100,14 +103,16 @@ else
fi fi
else else
send_discord_message "${SYSTEM_TYPE} system build of ${ALIAS} succeeded!" send_discord_message "${SYSTEM_TYPE} system build of ${ALIAS} succeeded!"
nfgc perform_cachix_push
perform_garbage_collection
fi fi
fi fi
if [[ -n ${NF_ACTIONS_TEST_ASYNC-} ]]; then if [[ -n ${NF_ACTIONS_TEST_ASYNC-} ]]; then
init_nfargs init_nfargs
if nix build "${nfargs[@]}" "${NIX_BUILD_ARGS_ASYNC[@]}"; then if nix build "${nfargs[@]}" "${NIX_BUILD_ARGS_ASYNC[@]}"; then
nfgc perform_cachix_push
perform_garbage_collection
else else
send_discord_message "Async build failure for ${nfsystem}, problem!" send_discord_message "Async build failure for ${nfsystem}, problem!"
exit 1 exit 1