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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 2f627b26d1562025d876329974cce91aee99d42e
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 12 14:48:00 2016 +0100

    switch build_binary to not use -sa as we have dedicated source builders
---
 lib/ci/build_binary.rb       | 21 ++++++++++++++++++---
 test/test_ci_build_binary.rb |  4 ++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/lib/ci/build_binary.rb b/lib/ci/build_binary.rb
index 08226ad..5ed02ec 100644
--- a/lib/ci/build_binary.rb
+++ b/lib/ci/build_binary.rb
@@ -1,6 +1,7 @@
 require 'fileutils'
 
 require_relative 'source'
+require_relative '../dpkg'
 require_relative '../lsb'
 require_relative '../retry'
 
@@ -29,13 +30,27 @@ module CI
     end
 
     def build_package
-      dpkg_buildopts = %w(-us -uc -sa)
+      # FIXME: buildpackage probably needs to be a method on the DPKG module
+      #   for logging purposes and so on and so forth
+      dpkg_buildopts = [
+        # Signing happens outside the container. So disable all signing.
+        '-us',
+        '-uc'
+      ]
       # Automatically decide how many concurrent build jobs we can support.
       # NOTE: special cased for trusty master servers to pass
       dpkg_buildopts << '-jauto' unless LSB::DISTRIB_CODENAME == 'trusty'
 
-      # Only build arch independent packages on AMD64
-      dpkg_buildopts << '-B' unless RbConfig::CONFIG['host_cpu'] == 'x86_64'
+      if DPKG::BUILD_ARCH == 'amd64'
+        # On arch:all only build the binaries, the source is already built.
+        dpkg_buildopts << '-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.
+        dpkg_buildopts << '-B'
+      end
 
       Dir.chdir(BUILD_DIR) do
         system('dpkg-buildpackage', *dpkg_buildopts)
diff --git a/test/test_ci_build_binary.rb b/test/test_ci_build_binary.rb
index 88f50e3..ce045cf 100644
--- a/test/test_ci_build_binary.rb
+++ b/test/test_ci_build_binary.rb
@@ -18,8 +18,8 @@ module CI
       assert_path_exist('hello_2.10-1_amd64.changes')
       changes = Debian::Changes.new('hello_2.10-1_amd64.changes')
       changes.parse!
-      assert_equal(3, # dsc + deb + orig
-                   changes.fields['files'].size)
+      assert_equal(["hello_2.10-1_amd64.deb"],
+                   changes.fields['files'].map(&:name))
     end
   end
 end

-- 
ci-tooling packaging