julian

julian deleted branch flake-updates from julian/dotfiles

2025-03-23 18:09:50 +00:00

julian created branch flake-updates in julian/hydra-jobs

2025-03-23 17:58:42 +00:00

julian pushed to flake-updates at julian/hydra-jobs

2025-03-23 17:58:42 +00:00

julian deleted branch flake-updates from julian/hydra-jobs

2025-03-23 17:58:20 +00:00

julian pushed to main at julian/hydra-jobs

2025-03-23 17:57:19 +00:00

3263a37074 workflow: push right after rebasing

julian pushed to flake-updates at julian/hydra-jobs

2025-03-23 17:54:18 +00:00

83276ed024 Update flake.lock 2025-03-23

c218f0fa08 Merge main branch squashed 2025-03-23

e2fa915bdd workflow: do not use squashed merging

9cfe01d3e4 Update flake.lock 2025-03-22

2be2381cc0 Merge main branch squashed 2025-03-22

Compare 18 commits »

julian pushed to main at julian/hydra-jobs

2025-03-23 17:52:05 +00:00

fc412f2596 workflow: use rebase instead of merge

julian pushed to flake-updates at julian/hydra-jobs

2025-03-23 17:45:44 +00:00

2f7d53b4b9 workflow: do not use squashed merging

julian pushed to master at julian/dotfiles

2025-03-22 11:55:25 +00:00

d964a181ad builder: add attic binary cache

27c36bb7f5 topgrade: update flake.lock to flake-updates branch version

Compare 2 commits »

julian pushed to main at julian/hydra-jobs

2025-03-22 09:51:36 +00:00

c9862e6efc workflow: change cron time

ed52562b55 workflow: use git diff --cached

Compare 2 commits »

julian pushed to master at julian/dotfiles

2025-03-22 08:21:04 +00:00

b76fe8d508 workflow: really fix git diff call by using --cached

julian pushed to master at julian/dotfiles

2025-03-22 08:17:07 +00:00

5c8f199fce workflow: add debug calls

julian pushed to master at julian/dotfiles

2025-03-22 08:14:23 +00:00

00a448010d workflow: fix git diff call

julian pushed to master at julian/dotfiles

2025-03-22 08:06:06 +00:00

b76da6e9eb workflow: use merge --squash instead of rebase

julian pushed to main at julian/hydra-jobs

2025-03-22 08:03:21 +00:00

8d9892e958 workflow: Simplify automatic merge conflict solving

julian pushed to main at julian/hydra-jobs

2025-03-22 07:59:20 +00:00

489b839452 Workflow: automatically solve merge conflict

julian pushed to main at julian/hydra-jobs

2025-03-22 07:46:44 +00:00

3801bbda11 remove unnecessary git push

julian pushed to main at julian/hydra-jobs

2025-03-22 07:45:17 +00:00

a2a3d2586c workflow: fix merge conflict failing script

julian pushed to main at julian/hydra-jobs

2025-03-22 07:43:06 +00:00

2ac3af7a53 workflow: first check if merge is necessary

julian pushed to main at julian/hydra-jobs

2025-03-22 07:34:30 +00:00

b0b6ef6bba workflow: use merge instead of rebase