steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Justfile/update-this-device: treat all rebuilds as errors

Browse source
This commit is contained in:
steveej 2019-03-03 00:14:28 +01:00
parent 08a2798496
commit 4711b39729
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Justfile
View file

@ -50,7 +50,8 @@ rebuild-this-device rebuildarg="dry-activate":
echo System rebuild successful echo System rebuild successful
else else
cat ${SYSREBUILD_LOG} cat ${SYSREBUILD_LOG}
echo System rebuild failed echo ERROR: system rebuild failed
exit 1
fi fi
if type home-manager > /dev/null 2>&1; then if type home-manager > /dev/null 2>&1; then
@ -60,7 +61,8 @@ rebuild-this-device rebuildarg="dry-activate":
echo Home rebuild successful echo Home rebuild successful
else else
cat ${HOMEREBUILD_LOG} cat ${HOMEREBUILD_LOG}
echo Home rebuild failed echo ERROR: home rebuild failed
exit 1
fi fi
fi fi
@ -71,7 +73,7 @@ rebuild-this-device rebuildarg="dry-activate":
# Update the channel versions and (by default) switch to new environment # Update the channel versions and (by default) switch to new environment
update-this-device rebuild-mode='switch': update-this-device rebuild-mode='switch':
#!/usr/bin/env bash #!/usr/bin/env bash
set -xe set -e
template=nix/os/devices/$(hostname -s)/versions.tmpl.nix template=nix/os/devices/$(hostname -s)/versions.tmpl.nix
outfile=nix/os/devices/$(hostname -s)/versions.nix outfile=nix/os/devices/$(hostname -s)/versions.nix
@ -89,12 +91,14 @@ update-this-device rebuild-mode='switch':
exit 1 exit 1
} }
git commit -v ${outfile} -m "nix/os/devices/$(hostname -s): bump versions"
just -v rebuild-this-device {{rebuild-mode}} || { just -v rebuild-this-device {{rebuild-mode}} || {
echo WARNING: Rebuilding in {{rebuild-mode}}-mode failed echo ERROR: Rebuilding in {{rebuild-mode}}-mode failed
git checkout ${outfile}
exit 1
} }
git commit -v ${outfile} -m "nix/os/devices/$(hostname -s): bump versions"
# Iterate on a qtile config by running it inside Xephyr. (un-/grab the mouse with Ctrl + Shift-L) # Iterate on a qtile config by running it inside Xephyr. (un-/grab the mouse with Ctrl + Shift-L)
hm-iterate-qtile: hm-iterate-qtile:
#!/usr/bin/env bash #!/usr/bin/env bash