clerie/nixfiles
1
0
Fork 0
Code

pkgs/clerie-update-nixfiles: use fast-forward as a softer approach to update master (so nothing gets lost)

Browse Source
This commit is contained in:
clerie 2024-03-19 18:15:47 +01:00
parent 9bc4ba3b77
commit 31c2bf2ede
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/clerie-update-nixfiles/clerie-merge-nixfiles-update.sh
View File

@ -45,7 +45,13 @@ echo "[!] Checkout master"
xgit checkout master xgit checkout master
echo "[!] Update master" echo "[!] Update master"
xgit pull origin master set +e
if ! xgit merge --ff-only origin/master; then
echo "[!] Merging failed"
echo "[!] Please clean up master branch and try again"
exit 1
fi
set -e
echo "[!] Fetch git commit of last hydra run" echo "[!] Fetch git commit of last hydra run"
echo "[!] Checking https://hydra.clerie.de/jobset/nixfiles/nixfiles-updated-inputs/latest-eval" echo "[!] Checking https://hydra.clerie.de/jobset/nixfiles/nixfiles-updated-inputs/latest-eval"