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

Fix laminar confis

Browse source
This commit is contained in:
Malte 2023-01-16 03:21:58 +01:00
parent aa3a056b4a
commit cf82d34507
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/roles/laminar/projects.nix
View file

@ -25,7 +25,6 @@
''; '';
in { in {
services.laminar.cfgFiles.jobs = { services.laminar.cfgFiles.jobs = {
"logfeed.run" = mkJob "logfeed";
"blog.run" = mkJob "blog"; "blog.run" = mkJob "blog";
"haskell-taskwarrior.run" = mkJob "haskell-taskwarrior"; "haskell-taskwarrior.run" = mkJob "haskell-taskwarrior";
"nix-output-monitor.run" = mkJob "nix-output-monitor"; "nix-output-monitor.run" = mkJob "nix-output-monitor";

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

@ -20,7 +20,7 @@ import Say
import Shh import Shh
import System.Environment (getEnv, setEnv) import System.Environment (getEnv, setEnv)
load Absolute ["laminarc", "git", "nix-build"] load Absolute ["laminarc", "git", "nix"]
repo = "git@hera.m-0.eu:nixos-config" repo = "git@hera.m-0.eu:nixos-config"
@ -51,7 +51,7 @@ main = do
git "checkout" (toString branch) git "checkout" (toString branch)
setEnv "LAMINAR_REASON" [i|Building config branch #{branch} for all systems in #{jobId}:#{runId}|] setEnv "LAMINAR_REASON" [i|Building config branch #{branch} for all systems in #{jobId}:#{runId}|]
say [i|Starting builds of branch #{branch} for all systems.|] say [i|Starting builds of branch #{branch} for all systems.|]
concurrently_ (mapConcurrently_ (\x -> laminarc ["run", x, [i|BRANCH=#{branch}|]]) jobs) $ nix_build "test.nix" concurrently_ (mapConcurrently_ (\x -> laminarc ["run", x, [i|BRANCH=#{branch}|]]) jobs) $ nix "flake" "check"
say [i|Builds succeeded.|] say [i|Builds succeeded.|]
when (branch == "main") $ do when (branch == "main") $ do
say [i|Deploying new config to localhost.|] say [i|Deploying new config to localhost.|]