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

Fix a polymorphism problem in tests

Browse source
This commit is contained in:
Malte Brandy 2020-05-16 18:00:14 +02:00
parent 39223a4ddd
commit 8f5117325a
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/test.nix
View file

@ -45,7 +45,6 @@ in rec {
main = do
bump <- (maybe False (== "bump") . listToMaybe) <$> getArgs
bracket checkout (rm "-rf") $ \repoDir -> do
let repoGit = git "-C" repoDir
withCurrentDirectory repoDir $ do
mapM_ (\x -> git_crypt "unlock" ([i|${configPath}/.git/git-crypt/keys/#{x}|] :: String)) ${
haskellList keys
@ -53,13 +52,13 @@ in rec {
when bump $ ignoreFailure $ niv "update"
changed <- (mempty /=) <$> (git "-C" repoDir "status" "--porcelain" |> captureTrim)
when changed $ do
repoGit "config" "user.email" "maralorn@maralorn.de"
repoGit "config" "user.name" "maralorn (nix-auto-updater)"
repoGit "commit" "-am" "Update dependencies with niv"
repoGit "push" "-f" "origin" "master:version-bump"
git "-C" repoDir "config" "user.email" "maralorn@maralorn.de"
git "-C" repoDir "config" "user.name" "maralorn (nix-auto-updater)"
git "-C" repoDir "commit" "-am" "Update dependencies with niv"
git "-C" repoDir "push" "-f" "origin" "master:version-bump"
mapM_ (test_system_config repoDir) ${haskellList systems}
mapM_ (test_home_config repoDir) ${haskellList homes}
when changed $ do
repoGit "push" "origin" "master:master"
git "-C" repoDir "push" "origin" "master:master"
'';
}