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

propellor spin

This commit is contained in:
Joey Hess 2014-05-24 00:05:47 -04:00
parent aba5e143f2
commit 60ea130321
Failed to extract signature
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-joey.hs
View File

@ -98,6 +98,7 @@ hosts = -- (o) `
& Docker.docked hosts "i386-git-annex-builder" & Docker.docked hosts "i386-git-annex-builder"
& Docker.docked hosts "armel-git-annex-builder-companion" & Docker.docked hosts "armel-git-annex-builder-companion"
& Docker.docked hosts "armel-git-annex-builder" & Docker.docked hosts "armel-git-annex-builder"
& Docker.docked hosts "android-git-annex-builder"
& Docker.garbageCollected `period` Daily & Docker.garbageCollected `period` Daily
& Apt.buildDep ["git-annex"] `period` Daily & Apt.buildDep ["git-annex"] `period` Daily
@ -196,6 +197,7 @@ hosts = -- (o) `
, GitAnnexBuilder.standardContainer dockerImage "i386" 45 "2h" , GitAnnexBuilder.standardContainer dockerImage "i386" 45 "2h"
, GitAnnexBuilder.armelCompanionContainer dockerImage , GitAnnexBuilder.armelCompanionContainer dockerImage
, GitAnnexBuilder.armelContainer dockerImage "1 3 * * *" "5h" , GitAnnexBuilder.armelContainer dockerImage "1 3 * * *" "5h"
, GitAnnexBuilder.androidContainer dockerImage "1 1 * * *" "3h"
] ++ monsters ] ++ monsters
-- This is my standard system setup. -- This is my standard system setup.

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

@ -103,6 +103,24 @@ standardContainer dockerImage arch buildminute timeout = Docker.container (arch
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& builder arch (show buildminute ++ " * * * *") timeout True & builder arch (show buildminute ++ " * * * *") timeout True
-- Android is cross-built in a Debian i386 container, using the Android NDK.
androidContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host
androidContainer dockerImage crontimes timeout = Docker.container "android-git-annex-builder"
(dockerImage $ System (Debian Stable) "i386")
& Apt.stdSourcesList Stable
& Apt.unattendedUpgrades
& builder "android" crontimes timeout True
-- Use git-annex's android chroot setup script, which will install
-- ghc-android and the NDK, etc, in the home directory of the
-- builder user.
& scriptProperty
[ "cd " ++ builddir ++ " && ./standalone/android/buildchroot-inchroot"
]
-- TODO: automate installing haskell libs
-- (Currently have to run
-- git-annex/standalone/android/install-haskell-packages
-- which is not fully automated.)
-- armel builder has a companion container using amd64 that -- armel builder has a companion container using amd64 that
-- runs the build first to get TH splices. They need -- runs the build first to get TH splices. They need
-- to have the same versions of all haskell libraries installed. -- to have the same versions of all haskell libraries installed.