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:09:58 -04:00
parent 7004b34a71
commit cc46cb1942
Failed to extract signature
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,9 @@ buildDepsNoHaskellLibs = Apt.installed ["git", "rsync", "moreutils", "ca-certifi
"libghc-dbus-dev", "libghc-fdo-notify-dev", "libghc-network-protocol-xmpp-dev" "libghc-dbus-dev", "libghc-fdo-notify-dev", "libghc-network-protocol-xmpp-dev"
] ]
noBuildDeps :: Property
noBuildDeps = propertyList "no build deps" []
-- 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.
cabalDeps :: Property cabalDeps :: Property
@ -109,10 +112,10 @@ 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 "android" crontimes timeout True & builder' noBuildDeps "android" crontimes timeout True
-- Use git-annex's android chroot setup script, which will install -- Use git-annex's android chroot setup script, which will install
-- ghc-android and the NDK, etc, in the home directory of the -- ghc-android and the NDK, all build deps, etc, in the home
-- builder user. -- directory of the builder user.
& scriptProperty & scriptProperty
[ "cd " ++ builddir ++ " && ./standalone/android/buildchroot-inchroot" [ "cd " ++ builddir ++ " && ./standalone/android/buildchroot-inchroot"
] ]