[SCM] ci-tooling packaging branch, master, updated. d0ae38b3fc9124ae87dd45c75c27bc4a563d25ee
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Thu Mar 5 08:23:40 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=eb1432f
The following commit has been merged in the master branch:
commit eb1432f227188e61d7ef0f3d130c5b7a62ef22f5
Author: Harald Sitter <sitter at kde.org>
Date: Thu Mar 5 09:22:49 2015 +0100
various rubocop format fixes
---
kci/builder.rb | 196 ++++++++++++++++++++++++++++++---------------------------
1 file changed, 104 insertions(+), 92 deletions(-)
diff --git a/kci/builder.rb b/kci/builder.rb
index f93c98a..209613f 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -39,7 +39,9 @@ Project = Struct.new(:series, :stability, :name)
# get basename, distro series, unstable/stable
components = ARGV[0].split('_')
-raise 'Did not get a valid project identifier via ARGV0' unless components.size == 3
+unless components.size == 3
+ fail 'Did not get a valid project identifier via ARGV0'
+end
project = Project.new(components[0], components[1], components[2])
PPA = "ppa:kubuntu-ci/#{project.stability}"
@@ -47,7 +49,7 @@ PPA = "ppa:kubuntu-ci/#{project.stability}"
File.open('/etc/apt/apt.conf.d/apt-cacher', 'w') { |file| file.puts('Acquire::http { Proxy "http://10.0.3.1:3142"; };') }
# PWD
-raise 'Could not change dir to ARGV1' unless Dir.chdir(ARGV[1])
+fail 'Could not change dir to ARGV1' unless Dir.chdir(ARGV[1])
WORKSPACE_PATH = ARGV[1]
@@ -56,7 +58,7 @@ WORKSPACE_PATH = ARGV[1]
# version
Dir.chdir('packaging') do
- $changelog = Changelog.new
+ $changelog = Changelog.new
end
# Note that the kubuntu version needs to be part of the *base* version as otherwise
@@ -76,16 +78,16 @@ FileUtils.mkpath('build/source/')
`cp -rv source/* build/source/`
Dir.chdir('build/source') do
- FileUtils.rm_rf(Dir.glob('**/.bzr'))
- FileUtils.rm_rf(Dir.glob('**/.git'))
- FileUtils.rm_rf(Dir.glob('**/.svn'))
+ FileUtils.rm_rf(Dir.glob('**/.bzr'))
+ FileUtils.rm_rf(Dir.glob('**/.git'))
+ FileUtils.rm_rf(Dir.glob('**/.svn'))
end
# create orig tar
Dir.chdir('build/') do
- tar = "#{source_name}_#{tar_version}.orig.tar"
- raise 'Failed to create a tarball' unless system("tar -cf #{tar} source")
- raise 'Failed to compress the tarball' unless system("xz -6 #{tar}")
+ tar = "#{source_name}_#{tar_version}.orig.tar"
+ fail 'Failed to create a tarball' unless system("tar -cf #{tar} source")
+ fail 'Failed to compress the tarball' unless system("xz -6 #{tar}")
end
# Copy some more
@@ -93,9 +95,16 @@ end
# Create changelog entry
Dir.chdir('build/source/') do
- raise 'Failed to create changelog entry' unless system({'DEBFULLNAME' => 'Kubuntu CI',
- 'DEBEMAIL' => 'kubuntu-ci at lists.launchpad.net'},
- "dch -b -v #{version} -D #{project.series} 'Automatic Kubuntu Build'")
+ env = {
+ 'DEBFULLNAME' => 'Kubuntu CI',
+ 'DEBEMAIL' => 'kubuntu-ci at lists.launchpad.net'
+ }
+ args = []
+ args << '-b'
+ args << '-v' << version
+ args << '-D' << project.series
+ args << '"Automatic Kubuntu Build"'
+ fail 'Failed to create changelog entry' unless system(env, 'dch', *args)
end
# Rip out locale install
@@ -131,22 +140,24 @@ end
# dpkg-buildpackage
Dir.chdir('build/source/') do
- system('update-maintainer')
- raise 'Failed to build source package' unless system("dpkg-buildpackage -S -k#{KEYID}")
+ system('update-maintainer')
+ unless system("dpkg-buildpackage -S -k#{KEYID}")
+ fail 'Failed to build source package'
+ end
end
# Upload
def timeout_spawn(cmd, timeout)
- pid = Process.spawn(cmd, {:pgroup => true})
- begin
- Timeout.timeout(timeout) do
- Process.waitpid(pid, 0)
- return ($?.exitstatus == 0)
- end
- rescue Timeout::Error
- Process.kill(15, -Process.getpgid(pid))
- return false
+ pid = Process.spawn(cmd, pgroup: true)
+ begin
+ Timeout.timeout(timeout) do
+ Process.waitpid(pid, 0)
+ return ($?.exitstatus == 0)
end
+ rescue Timeout::Error
+ Process.kill(15, -Process.getpgid(pid))
+ return false
+ end
end
Dir.chdir('build/source/') do
changelog = Changelog.new
@@ -184,29 +195,29 @@ end
exit 0 unless File.exist?('logs/i386.log.gz')
def segmentify(data, start_marker, end_marker)
- start_index = data.index(start_marker)
- end_index = data.index(end_marker)
- return [] unless start_index and end_index
- data = data.slice(start_index..end_index).split("
")
- data.shift # Ditch start line
- data.pop # Ditch end line
- return data
+ start_index = data.index(start_marker)
+ end_index = data.index(end_marker)
+ return [] unless start_index && end_index
+ data = data.slice(start_index..end_index).split("
")
+ data.shift # Ditch start line
+ data.pop # Ditch end line
+ data
end
def puts_kci(type, str)
- puts "KCI-#{type} :: #{str}"
+ puts "KCI-#{type} :: #{str}"
end
def puts_error(str)
- puts_kci('E', str)
+ puts_kci('E', str)
end
def puts_warning(str)
- puts_kci('W', str)
+ puts_kci('W', str)
end
def puts_info(str)
- puts_kci('I', str)
+ puts_kci('I', str)
end
def cmake_parse_optional!(data)
@@ -243,77 +254,78 @@ def cmake_parse_package(line)
end
def cmake_parse_warning(line)
- return [] unless line.include?('CMake Warning')
- # Lines coming from MacroOptionalFindPackage (from old parsing).
- return [] if line.include?('CMake Warning at /usr/share/kde4/apps/cmake/modules/MacroOptionalFindPackage.cmake')
- # Lines coming from find_package (from old parsing).
- return [] if line.match(/CMake Warning at [^ :]+:\d+ \(find_package\)/)
- # Lines coming from warnings inside the actual CMakeLists.txt as those can be arbitrary.
- # ref: "CMake Warning at src/worker/CMakeLists.txt:33 (message):"
- return [] if line.match(/CMake Warning at [^ :]*CMakeLists.txt:\d+ \(message\)/)
- return [] if line.start_with?('CMake Warning (dev)')
- return [] if line.start_with?('CMake Warning:')
- return [line]
+ return [] unless line.include?('CMake Warning')
+ # Lines coming from MacroOptionalFindPackage (from old parsing).
+ return [] if line.include?('CMake Warning at /usr/share/kde4/apps/cmake/modules/MacroOptionalFindPackage.cmake')
+ # Lines coming from find_package (from old parsing).
+ return [] if line.match(/CMake Warning at [^ :]+:\d+ \(find_package\)/)
+ # Lines coming from warnings inside the actual CMakeLists.txt as those can be arbitrary.
+ # ref: "CMake Warning at src/worker/CMakeLists.txt:33 (message):"
+ return [] if line.match(/CMake Warning at [^ :]*CMakeLists.txt:\d+ \(message\)/)
+ return [] if line.start_with?('CMake Warning (dev)')
+ return [] if line.start_with?('CMake Warning:')
+ [line]
end
def puts_cmake(data, source_name)
- data = segmentify(data, "dh_auto_configure", "dh_auto_build")
- return if data.empty?
+ data = segmentify(data, 'dh_auto_configure', 'dh_auto_build')
+ return if data.empty?
- missing = []
- warnings = []
- while not data.empty?
- line = data.shift
- if line.include?('The following OPTIONAL packages have not been found')
- missing += cmake_parse_optional!(data)
- elsif line.include?('Could not find a package configuration file provided by')
- missing += cmake_parse_package(line)
- elsif line.include?('CMake Warning')
- warnings += cmake_parse_warning(line)
- end
+ missing = []
+ warnings = []
+ until data.empty?
+ line = data.shift
+ if line.include?('The following OPTIONAL packages have not been found')
+ missing += cmake_parse_optional!(data)
+ elsif line.include?('Could not find a package configuration file provided by')
+ missing += cmake_parse_package(line)
+ elsif line.include?('CMake Warning')
+ warnings += cmake_parse_warning(line)
end
+ end
- missing.uniq!
- warnings.uniq!
+ missing.uniq!
+ warnings.uniq!
- puts "KCI::CMAKE"
+ puts 'KCI::CMAKE'
- ignore_missing = []
- cmake_ignore_path = "#{WORKSPACE_PATH}/packaging/debian/meta/cmake-ignore"
- if File.exist?(cmake_ignore_path)
- ignore_missing += File.read(cmake_ignore_path).strip.split("
")
- end
+ ignore_missing = []
+ cmake_ignore_path = "#{WORKSPACE_PATH}/packaging/debian/meta/cmake-ignore"
+ if File.exist?(cmake_ignore_path)
+ ignore_missing += File.read(cmake_ignore_path).strip.split("
")
+ end
- missing.each do |dep|
- p dep
- p ignore_missing
- ignore = false
- ignore_missing.each do |possibly_ignore|
- p possibly_ignore == dep
- p dep.start_with?(possibly_ignore)
- p dep.start_with?(possibly_ignore.chomp('*'))
- if possibly_ignore == dep or dep.start_with?(possibly_ignore) or dep.start_with?(possibly_ignore.chomp('*'))
- ignore = true
- break
- end
- end
- next if ignore
- puts_warning("Missing Dep: #{dep}")
+ missing.each do |dep|
+ p dep
+ p ignore_missing
+ ignore = false
+ ignore_missing.each do |possibly_ignore|
+ p possibly_ignore == dep
+ p dep.start_with?(possibly_ignore)
+ p dep.start_with?(possibly_ignore.chomp('*'))
+ if possibly_ignore == dep || dep.start_with?(possibly_ignore) ||
+ dep.start_with?(possibly_ignore.chomp('*'))
+ ignore = true
+ break
+ end
end
+ next if ignore
+ puts_warning("Missing Dep: #{dep}")
+ end
- warnings.each do |warning|
- puts_warning(warning)
- end
+ warnings.each do |warning|
+ puts_warning(warning)
+ end
end
def puts_list_missing(data)
- data = segmentify(data, "=== Start list-missing
", "=== End list-missing
")
- return if data.empty?
- puts "KCI::MISSING"
- data.each do |line|
- # Missing files are always considered errors
- puts_error(line)
- end
+ data = segmentify(data, "=== Start list-missing
", "=== End list-missing
")
+ return if data.empty?
+ puts 'KCI::MISSING'
+ data.each do |line|
+ # Missing files are always considered errors
+ puts_error(line)
+ end
end
def puts_lintian(data, args = {})
@@ -406,6 +418,6 @@ end
puts_cmake(log_data, source_name)
puts_list_missing(log_data)
-puts_lintian(log_data, :updated_symbols => updated_symbols)
+puts_lintian(log_data, updated_symbols: updated_symbols)
# TODO: try to figure out when a qml dep is needed and make sure it is there...
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list