merge: merged leyla/main
This commit is contained in:
parent
3a58722815
commit
0a8b3e1496
120 changed files with 2396 additions and 4519 deletions
|
|
@ -17,8 +17,8 @@ fi
|
|||
if [ "$target_branch" = "main" ]; then
|
||||
echo "Merging into main branch - running nix flake check..."
|
||||
|
||||
echo "stashing all uncommitted changes"
|
||||
git stash -q --keep-index
|
||||
echo "stashing all uncommitted changes with named stash (excluding hooks)"
|
||||
git stash push -q --keep-index -m "pre-merge-stash-$(date +%s)" -- ':!.hooks/'
|
||||
|
||||
echo "checking flakes all compile"
|
||||
nix flake check
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue