From c4f865f7d39c987e13eaca7d1e72430562b2ca02 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 24 Aug 2016 19:36:19 -0700 Subject: update sample config for sbuild 0.71.0 --- src/Propellor/Property/Sbuild.hs | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 7a27473c..e2080ee3 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -4,7 +4,8 @@ {-| Maintainer: Sean Whitton -Build and maintain schroots for use with sbuild. +Build and maintain schroots for use with sbuild. Assumes that the +version of sbuild available is at least 0.71.0. Suggested usage in @config.hs@: @@ -21,27 +22,14 @@ In @~/.sbuildrc@: > $run_piuparts = 1; > $piuparts_opts = [ > '--schroot', -> 'unstable-i386-piuparts', +> '%r-%a-piuparts', > '--fail-if-inadequate', > '--fail-on-broken-symlinks', > ]; > -> $external_commands = { -> 'post-build-commands' => [ -> [ -> 'adt-run', -> '--changes', '%c', -> '---', -> 'schroot', 'unstable-i386-sbuild;', -> -> # if adt-run's exit code is 8 then the package had no tests but -> # this isn't a failure, so catch it -> 'adtexit=$?;', -> 'if', 'test', '$adtexit', '=', '8;', 'then', -> 'exit', '0;', 'else', 'exit', '$adtexit;', 'fi' -> ], -> ], -> }; +> $run_autopkgtest = 1; +> $autopkgtest_root_args = ""; +> $autopkgtest_opts = ["--", "schroot", "%r-%a-sbuild"]; We use @sbuild-createchroot(1)@ to create a chroot to the specification of @sbuild-setup(7)@. This differs from the approach taken by picca's Sbuild.hs, -- cgit v1.2.3