From 8a36d5ed51c14789dce4d8ce20951e66172354c4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 3 Oct 2018 13:06:13 -0400 Subject: propellor spin --- joeyconfig.hs | 6 +++++- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index d0978954..76646829 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -207,12 +207,16 @@ honeybee = host "honeybee.kitenet.net" $ props & Postfix.satellite & check (not <$> inChroot) (setupRevertableProperty autobuilder) + & check (not <$> inChroot) (setupRevertableProperty ancientautobuilder) -- In case compiler needs more than available ram & Apt.serviceInstalledRunning "swapspace" where autobuilder = Systemd.nspawned $ GitAnnexBuilder.autoBuilderContainer - GitAnnexBuilder.armAutoBuilder + (GitAnnexBuilder.armAutoBuilder GitAnnexBuilder.standardAutoBuilder) Unstable ARMEL Nothing (Cron.Times "15 15 * * *") "10h" + ancientautobuilder = Systemd.nspawned $ GitAnnexBuilder.autoBuilderContainer + (GitAnnexBuilder.armAutoBuilder GitAnnexBuilder.stackAutoBuilder) + (Stable "jessie") ARMEL (Just "ancient") (Cron.Times "5 15 * * *") "10h" -- This is not a complete description of kite, since it's a -- multiuser system with eg, user passwords that are not deployed diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index e3d21ac1..bf2741c1 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -173,10 +173,10 @@ stackInstalled = withOS "stack installed" $ \w o -> tmptar = "/root/stack.tar.gz" tmpdir = "/root/stack" -armAutoBuilder :: DebianSuite -> Architecture -> Flavor -> Property (HasInfo + Debian) -armAutoBuilder suite arch flavor = +armAutoBuilder :: (DebianSuite -> Architecture -> Flavor -> Property (HasInfo + Debian)) -> DebianSuite -> Architecture -> Flavor -> Property (HasInfo + Debian) +armAutoBuilder baseautobuilder suite arch flavor = propertyList "arm git-annex autobuilder" $ props - & standardAutoBuilder suite arch flavor + & baseautobuilder suite arch flavor & buildDepsApt -- Works around ghc crash with parallel builds on arm. & (homedir ".cabal" "config") -- cgit v1.2.3