maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Improve flake updates

Browse source
This commit is contained in:
Malte 2023-02-05 11:55:17 +01:00
parent c531183cfb
commit 026f63eb88
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nixos/roles/laminar/bump-config.hs
View file

@ -10,6 +10,7 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# OPTIONS_GHC -Wall -Werror -Wno-missing-signatures -Wno-type-defaults -Wno-orphans #-}
import Data.ByteString.Lazy qualified as LBS
import Data.String.Interpolate
import Data.Text qualified as Text
import Language.Haskell.TH
@ -30,13 +31,12 @@ paths =
repo = "git@hera.m-0.eu:nixos-config"
main = do
git "config" "user.email" "maralorn@maralorn.de"
git "config" "user.name" "maralorn (nix-auto-updater)"
git "clone" repo "."
setEnv "PATH" . toString $ Text.intercalate ":" paths
ignoreFailure $ nix "flake" "update"
changed <- (mempty /=) <$> (git "status" "--porcelain" |> captureTrim)
when changed $ do
git "config" "user.email" "maralorn@maralorn.de"
git "config" "user.name" "maralorn (nix-auto-updater)"
git "commit" "-am" "Update flake dependencies"
git "push" "-f" "origin" "HEAD:niv-bump"
unless changed $ say "No flake updates. Doing nothing."
ignoreFailure $ nix "flake" "update" "--commit-lock-file" "--commit-lockfile-summary"
changed <- LBS.null <$> (git "branch" "-r" "--contains" "HEAD" |> captureTrim)
if changed
then git "push" "-f" "origin" "HEAD:flake-lock-update"
else say "No flake updates. Doing nothing."

6
nixos/roles/laminar/test-config.hs
View file

@ -38,8 +38,8 @@ main = do
when (branch == "main") $ do
say [i|Deploying new config to localhost.|]
exe "/run/wrappers/bin/sudo" deployCommand
when (branch == "niv-bump") $ do
say [i|Merging branch niv-bump into main.|]
when (branch == "flake-lock-update") $ do
say [i|Merging branch flake-lock-update into main.|]
git "checkout" "main"
git "merge" "origin/niv-bump"
git "merge" "origin/flake-lock-update"
git "push"