packaging_rake_tasks 1.4.13 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '059259f817d554fce29ebcb0edd1b37514644bd605322ec6b74183618330c8ae'
-  data.tar.gz: d088cc1ab6e04f6cd50023139ddedcda07c148eb0a3002009b1a166cfa7f430c
+  metadata.gz: 99d2716778ca9f5bae89a0ff9a024ed8287c1892907b1a9bd6b57da3e35be4b6
+  data.tar.gz: 5c53d47b4e44df0f737f6de4650bed1780f3f4c197514e8ac6dc3bbdcb140080
 SHA512:
-  metadata.gz: 966f38193b4f25996858052867e0e24b5b75542f32d25e648fec74b7b82053683f0f004c18bfb53e3a47e835b80ccc62f53a5f3322d6a8ab9d9a9018532d967a
-  data.tar.gz: 3a890f6ee3d46236e7354ed0f483e9a6315cd0de3e03b66e1f27c9ce53861d5ff4a6fe36570eb73580ecb035bbd586fa5cc50cc76cbb2539c112b39db12f30ed
+  metadata.gz: de603feead7958f7ac02a6263a7fe6b8aa36691d948c995398b7327d9f3ed9c753f564409e4e2aaa18df590856f5181e14cb20e07be4468a1763dd4b6a8e74c7
+  data.tar.gz: 167c400d98bd31136c73dbaf88e62308878e155ca9d43f63a7e8fb6ecbcdec2867e8719a1f05b4cec501b9dfab7ce5af7b6c13f34aeb3bd6837e09545e95143c

data/VERSION

@@ -1 +1 @@
-1.4.13
+1.5.1

data/lib/packaging/configuration.rb

@@ -80,5 +80,18 @@ module Packaging
       return @version = File.read(versions.first).strip unless versions.empty?
       raise "cannot find version" #TODO more heuristic
     end
+
+    # configuration summary
+    # @return [Array<String>] human readable summary
+    def summary
+      [
+        "Package directory: #{package_dir}",
+        "OBS instance:      #{obs_api}",
+        "OBS project:       #{obs_project}",
+        "OBS package name:  #{package_name}",
+        "OBS build target:  #{build_dist}",
+        "OBS submit target: #{obs_sr_project}"
+      ]
+    end
   end
 end

data/lib/tasks/build_dependencies.rake

@@ -56,7 +56,9 @@ namespace :build_dependencies do
     else
       sudo = Process.euid.zero? ? "" : "sudo"
       interactive = $stdin.tty? ? "" : "--non-interactive"
-      cmd = "#{sudo} zypper #{interactive} install #{escaped_list}"
+      # allow package downgrade to avoid failures in CI when the installed
+      # packages are higher than the available ones
+      cmd = "#{sudo} zypper #{interactive} install --allow-downgrade #{escaped_list}"
       sh(cmd)
     end
   end

data/lib/tasks/check_committed.rake

@@ -16,7 +16,7 @@
 
 
 namespace :check do
-  desc "check if everything is commited to git repository"
+  desc "check if everything is committed to git repository"
   task :committed do
     ignored = `git ls-files -o --exclude-standard .`
 
@@ -26,12 +26,17 @@ namespace :check do
       raise "New files missing in git (or add them to to .gitignore):\n#{ignored}\n\n"
     end
 
+    if ENV["CHECK_MODIFIED"] == "0" || ENV["CHECK_MODIFIED"] == "false"
+      puts "WARNING: Skipping modified files check!"
+      next
+    end
+
     modified = `git ls-files -m --exclude-standard .`
 
     raise "git ls-files failed." unless $?.exitstatus.zero?
 
     if ! modified.empty?
-      raise "Modified files not commited:\n#{modified}"
+      raise "Modified files not committed:\n#{modified}"
     end
   end
 end

data/lib/tasks/check_license.rake

@@ -64,6 +64,9 @@ def license_report
     elsif fn =~ /\.md\z/ || fn =~ /\.doc\z/ || fn =~ /\.txt\z/
       report[:skipped] << "#{fn}: skipped by name match (documentation file)"
       next
+    elsif fn =~ /\.svg\z/ || fn =~ /\.eps\z/
+      report[:skipped] << "#{fn}: skipped by name match (vector image)"
+      next
     end
     skipped = Packaging::Configuration.instance.skip_license_check.any? do |skip|
       res = fn =~ skip

data/lib/tasks/osc.rake

@@ -160,8 +160,12 @@ namespace :osc do
       Dir.chdir osc_checkout_dir do
         puts "building package..." if verbose
 
-        # pipe yes to osc build to automatic rebuild broken build root if it happen
-        command = "yes | osc -A '#{obs_api}' build"
+        # feed the "osc build" command with "y" input to automatically rebuild
+        # the broken build root if that happens, three attempts should be enough in most cases
+        # do not use the "yes" command here as the endless output might cause endless loop
+        # (workaround for a broken rpmlint/checkbashisms test,
+        # https://bugzilla.suse.com/show_bug.cgi?id=1190094)
+        command = "echo -e 'y\\ny\\ny\\n' | osc -A '#{obs_api}' build"
         command << " --no-verify" #ignore untrusted BS projects
         command << " --release=1" #have always same release number
         # store packages for given base system at one place, so it speeds up rebuild
@@ -227,7 +231,7 @@ namespace :osc do
     desc "Create submit request from devel project to target project without any other packaging or checking"
     task :force do
       # wait for the server service to finish to avoid "service in progress"
-      # error when creating a SR for a freshly commited package
+      # error when creating a SR for a freshly committed package
       puts "Waiting for the server side service..."
       sh "osc", "-A", obs_api, "service", "wait", obs_project, package_name
 
@@ -239,4 +243,9 @@ namespace :osc do
       end
     end
   end
+
+  desc "Print the current packaging configuration"
+  task :config do
+    puts Packaging::Configuration.instance.summary.join("\n")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.5.1
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing tasks to package project in git and integration with