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

propellor spin

This commit is contained in:
Joey Hess 2014-05-26 18:46:42 -04:00
parent e71bed6640
commit 9fa0393f38
Failed to extract signature
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,21 +75,24 @@ tree buildarch = combineProperties "gitannexbuilder tree"
buildDeps :: Property buildDeps :: Property
buildDeps = combineProperties "gitannexbuilder build deps" buildDeps = combineProperties "gitannexbuilder build deps"
[ Apt.buildDep ["git-annex"] [ Apt.buildDep ["git-annex"]
, buildDepsNoHaskellLibs , buildDepsFewHaskellLibs
, "git-annex source build deps installed" ==> Apt.buildDepIn builddir , "git-annex source build deps installed" ==> Apt.buildDepIn builddir
] ]
buildDepsNoHaskellLibs :: Property buildDepsFewHaskellLibs :: Property
buildDepsNoHaskellLibs = Apt.installed ["git", "rsync", "moreutils", "ca-certificates", buildDepsFewHaskellLibs = combineProperties "gitannexbuilder build deps"
"debhelper", "ghc", "curl", "openssh-client", "git-remote-gcrypt", [ buildDepsNoHaskellLibs
"liblockfile-simple-perl", "cabal-install", "vim", "less",
"alex", "happy", "c2hs",
-- these haskell libs depend on C libs and don't use TH -- these haskell libs depend on C libs and don't use TH
"libghc-dbus-dev", "libghc-fdo-notify-dev", "libghc-network-protocol-xmpp-dev" , Apt.installed ["libghc-dbus-dev", "libghc-fdo-notify-dev", "libghc-network-protocol-xmpp-dev"]
] ]
noBuildDeps :: Property buildDepsNoHaskellLibs :: Property
noBuildDeps = propertyList "no build deps" [] buildDepsNoHaskellLibs = Apt.installed
["git", "rsync", "moreutils", "ca-certificates",
"debhelper", "ghc", "curl", "openssh-client", "git-remote-gcrypt",
"liblockfile-simple-perl", "cabal-install", "vim", "less",
"alex", "happy", "c2hs"
]
-- Installs current versions of git-annex's deps from cabal, but only -- Installs current versions of git-annex's deps from cabal, but only
-- does so once. -- does so once.
@ -112,7 +115,7 @@ androidContainer dockerImage crontimes timeout = Docker.container "android-git-a
(dockerImage $ System (Debian Stable) "i386") (dockerImage $ System (Debian Stable) "i386")
& Apt.stdSourcesList Stable & Apt.stdSourcesList Stable
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& builder' noBuildDeps "android" crontimes timeout True & builder' buildDepsNoHaskellLibs "android" crontimes timeout True
& flagFile chrootsetup ("/chrootsetup") & flagFile chrootsetup ("/chrootsetup")
-- TODO: automate installing haskell libs -- TODO: automate installing haskell libs
-- (Currently have to run -- (Currently have to run
@ -138,7 +141,7 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-
& Docker.volume gitbuilderdir & Docker.volume gitbuilderdir
-- Install current versions of build deps from cabal. -- Install current versions of build deps from cabal.
& tree "armel" & tree "armel"
& buildDepsNoHaskellLibs & buildDepsFewHaskellLibs
& cabalDeps & cabalDeps
-- The armel builder can ssh to this companion. -- The armel builder can ssh to this companion.
& Docker.expose "22" & Docker.expose "22"
@ -157,7 +160,7 @@ armelContainer dockerImage crontimes timeout = Docker.container "armel-git-annex
-- (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.)
& builder' buildDepsNoHaskellLibs "armel" crontimes timeout True & builder' buildDepsFewHaskellLibs "armel" crontimes timeout True
& Ssh.keyImported SshRsa builduser & Ssh.keyImported SshRsa builduser
& trivial writecompanionaddress & trivial writecompanionaddress
where where