cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-06-10 10:08:12 -04:00
parent 5dcebc78fd
commit f65cd1500f
Failed to extract signature
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
View File

@ -69,22 +69,17 @@ tree buildarch = combineProperties "gitannexbuilder tree"
buildDepsApt :: Property buildDepsApt :: Property
buildDepsApt = combineProperties "gitannexbuilder build deps" buildDepsApt = combineProperties "gitannexbuilder build deps"
[ Apt.buildDep ["git-annex"] [ Apt.buildDep ["git-annex"]
, buildDepsFewHaskellLibs , buildDepsNoHaskellLibs
, "git-annex source build deps installed" ==> Apt.buildDepIn builddir , "git-annex source build deps installed" ==> Apt.buildDepIn builddir
] ]
buildDepsFewHaskellLibs :: Property
buildDepsFewHaskellLibs = combineProperties "gitannexbuilder build deps"
[ buildDepsNoHaskellLibs
-- these haskell libs depend on C libs and don't use TH
, Apt.installed ["libghc-dbus-dev", "libghc-fdo-notify-dev", "libghc-network-protocol-xmpp-dev"]
]
buildDepsNoHaskellLibs :: Property buildDepsNoHaskellLibs :: Property
buildDepsNoHaskellLibs = Apt.installed buildDepsNoHaskellLibs = Apt.installed
["git", "rsync", "moreutils", "ca-certificates", ["git", "rsync", "moreutils", "ca-certificates",
"debhelper", "ghc", "curl", "openssh-client", "git-remote-gcrypt", "debhelper", "ghc", "curl", "openssh-client", "git-remote-gcrypt",
"liblockfile-simple-perl", "cabal-install", "vim", "less", "liblockfile-simple-perl", "cabal-install", "vim", "less",
-- needed by haskell libs
"libxml2-dev", "libidn11-dev", "libgsasl7-dev", "libgnutls-dev",
"alex", "happy", "c2hs" "alex", "happy", "c2hs"
] ]
@ -154,7 +149,7 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-
& User.accountFor builduser & User.accountFor builduser
-- Install current versions of build deps from cabal. -- Install current versions of build deps from cabal.
& tree "armel" & tree "armel"
& buildDepsFewHaskellLibs & buildDepsNoHaskellLibs
& cabalDeps & cabalDeps
-- The armel builder can ssh to this companion. -- The armel builder can ssh to this companion.
& Docker.expose "22" & Docker.expose "22"
@ -176,7 +171,7 @@ armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "arme
-- (Currently have to run -- (Currently have to run
-- git-annex/standalone/linux/install-haskell-packages -- git-annex/standalone/linux/install-haskell-packages
-- which is not fully automated.) -- which is not fully automated.)
& buildDepsFewHaskellLibs & buildDepsNoHaskellLibs
& autobuilder crontimes timeout True & autobuilder crontimes timeout True
`requires` tree "armel" `requires` tree "armel"
& Ssh.keyImported SshRsa builduser & Ssh.keyImported SshRsa builduser