[SCM] ci-tooling packaging branch, master, updated. 3a6df2d8f8ca55df1e1a59831df1745e24b0d2b8

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=3a6df2d

The following commit has been merged in the master branch:
commit 3a6df2d8f8ca55df1e1a59831df1745e24b0d2b8
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Jul 1 12:03:27 2015 +0200

    do not build arch:all on architectures other than amd64
---
 kci/binarier.rb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/kci/binarier.rb b/kci/binarier.rb
index cf7ace1..3675475 100755
--- a/kci/binarier.rb
+++ b/kci/binarier.rb
@@ -6,6 +6,7 @@ require 'json'
 require 'net/http'
 require 'timeout'
 
+require_relative 'lib/dpkg'
 require_relative 'lib/apt'
 
 ENV['HOME'] = '/var/lib/jenkins'
@@ -63,7 +64,23 @@ Dir.chdir(dir) do
   Apt.update
   Apt.install('pbuilder')
   system('/usr/lib/pbuilder/pbuilder-satisfydepends')
-  system('dpkg-buildpackage', '-us', '-uc', '-b', '-jauto')
+  build_args = [
+    # Signing happens outside the container.
+    '-us',
+    '-uc',
+    # Automatically decide how many concurrent build jobs we can support.
+    '-jauto'
+  ]
+  if DPKG::BUILD_ARCH == 'amd64'
+    # On arch:all only build the binaries, the source is already built.
+    build_args << '-b'
+  else
+    # We only build arch:all on amd64, all other architectures must only build
+    # architecture dependent packages. Otherwise we have confliciting checksums
+    # when publishing arch:all packages of different architectures to the repo.
+    build_args << '-B'
+  end
+  system('dpkg-buildpackage', *build_args)
 end
 
 debs = Dir.glob('*.deb')

-- 
ci-tooling packaging