yast-rake 0.2.43 → 0.2.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 183bdc451acadf652d5ef8d5749b166770f3664b2f73139cadab86f59b35f9e7
-  data.tar.gz: 86a255dfe87bb4b38128568e04752e4a111c2840bbd880499a12f6f0447e3e71
+  metadata.gz: ac63a47eacc8d5837b6ec2ca69605c214fed661530fbae576d154706d8a1317f
+  data.tar.gz: ef9b8e4ebd0846d0d9f2d72c3b17e1176d4afd674156dbfeb5f39339b13a0488
 SHA512:
-  metadata.gz: 778c1d1c7e5258ce439e0e6d16ec01b0eb20cbb1ac4a7260f497a1256b189865d5d594ba4f1dbf18b9dc6accbaf2430ccb4f3510b19c7a65ae0b56ff5a06c8c0
-  data.tar.gz: 848c641d6d94d8b40a610d575b4fc0f63df0942b5fe0987663511d11761278ddb560e8e86d1a20a19b3b5529be2b012c9cc4f7d593934613e6832366e1eaaa42
+  metadata.gz: cafea33f6f6a17c45b1eae38368536d5f283f939118ab5fd6d0af7dd1bc8c2cf59b75aa8b27dca6ba1100c04417ae7ea548a2a16075d3484a6dcd73aeb07c05e
+  data.tar.gz: a7c9caac9a4c08d87aa8371459cec1d4c06c26bf7ee2c2135337e48c74a3a9d3914a043978ad7f23666fa917c7fe33f517bc9c6ea0439510b286cc6e0c63eeac

data/VERSION

@@ -1 +1 @@
-0.2.43
+0.2.46

data/data/targets.yml

@@ -98,8 +98,8 @@
 :sle_latest:
   obs_api: "https://api.suse.de/"
   obs_project: "Devel:YaST:Head"
-  obs_sr_project: "SUSE:SLE-15-SP4:GA"
-  obs_target: "SUSE_SLE-15-SP4_GA"
+  obs_sr_project: "SUSE:SLE-15-SP5:GA"
+  obs_target: "SUSE_SLE-15-SP5_GA"
 :factory:
   obs_project: "YaST:Head"
   obs_sr_project: "openSUSE:Factory"

data/lib/tasks/github_actions/github_actions/job.rb

@@ -22,7 +22,7 @@ module GithubActions
   # Github Actions job
   # @see https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
   class Job
-    attr_reader :name, :steps, :runs_on, :container, :workflow
+    attr_reader :name, :steps, :runs_on, :container, :workflow, :matrix
 
     # @param name [String] name of the job
     # @param data [Hash] data from the workflow YAML file
@@ -32,6 +32,7 @@ module GithubActions
       @runs_on = data["runs-on"]
       @container = data["container"]
       @workflow = workflow
+      @matrix = data.fetch("strategy", {})["matrix"]
 
       @steps = data["steps"].map do |step|
         Step.new(self, step)

data/lib/tasks/github_actions/github_actions/job_runner.rb

@@ -78,7 +78,23 @@ module GithubActions
         abort "Unsupported container definition: #{job.container.inspect}"
       end
 
-      Container.new(image_name, options.to_s)
+      Container.new(expand_name(image_name), options.to_s)
+    end
+
+    # replace the ${{ matrix.<value> }} placeholders in the image name
+    #
+    # @param image_name [String] name of the Docker image
+    # @return [String] name with replaced values
+    def expand_name(image_name)
+      image_name.gsub(/\$\{\{\s*matrix\.[^}]*\}\}/) do |subst|
+        name = /\$\{\{\s*matrix\.([^}]*)\}\}/.match(subst)[1].strip
+        value = job.matrix ? job.matrix[name] : subst
+
+        # if the value is an Array use the first value by default
+        replacement = value.is_a?(Array) ? value.first : value.to_s
+        puts "Using ${{matrix.#{name}}} value: #{replacement.inspect}"
+        replacement
+      end
     end
 
     # run a job step

data/lib/tasks/rubocop.rake

@@ -15,12 +15,24 @@
 #
 #++
 
+# the default old version used
+OLD_RUBOCOP_VERSION = "0.41.2"
+
+def rubocop_version
+  return @rubocop_version if @rubocop_version
+
+  @rubocop_version = if File.read(".rubocop.yml").match(/rubocop-(\d+\.\d+\.\d+)/)
+    Regexp.last_match[1]
+  else
+    OLD_RUBOCOP_VERSION
+  end
+end
+
 def rubocop_bin
   return @rubocop_bin if @rubocop_bin
   return @rubocop_bin = ENV["RUBOCOP_BIN"] if ENV["RUBOCOP_BIN"]
 
-  version = File.read(".rubocop.yml").include?("rubocop-0.71.0") ? "0.71.0" : "0.41.2"
-  binary = `/usr/sbin/update-alternatives --list rubocop | grep '#{version}'`.strip
+  binary = `/usr/sbin/update-alternatives --list rubocop | grep '#{rubocop_version}'`.strip
   if !system("which #{binary}")
     raise "cannot find proper version of rubocop binary in " \
       "'/usr/sbin/update-alternatives --list rubocop'." \
@@ -32,18 +44,26 @@ end
 # run Rubocop in parallel
 # @param params [String] optional Rubocop parameters
 def run_rubocop(params = "")
-  # how it works:
-  # 1) get the list of inspected files by Rubocop
-  # 2) shuffle it randomly (better would be evenly distribute them according to
-  #    the analysis complexity but that is hard to evaluate and even simply
-  #    distributing by file size turned out to be ineffective and slower than
-  #    a simple random shuffling)
-  # 3) pass that as input for xargs
-  #    a) use -P with number of processors to run the commands in parallel
-  #    b) use -n to set the maximum number of files per process, this number
-  #       is computed to equally distribute the files across the workers
-  sh "#{rubocop_bin} -L | sort -R | xargs -P`nproc` -n$(expr `#{rubocop_bin} -L | wc -l` / " \
-    "`nproc` + 1) #{rubocop_bin} #{params}"
+  # newer Rubocop versions support the "-P" ("--parallel") option,
+  # but that is not compatible with the "-a" ("--auto-correct") option
+  if rubocop_version != OLD_RUBOCOP_VERSION && !params.to_s.match(/-a|--auto-correct/)
+    sh "#{rubocop_bin} -P #{params}"
+  else
+    # for older Rubocop or auto-correct mode manually start multiple instances in parallel
+    #
+    # how it works:
+    # 1) get the list of inspected files by Rubocop
+    # 2) shuffle it randomly (better would be evenly distribute them according to
+    #    the analysis complexity but that is hard to evaluate and even simply
+    #    distributing by file size turned out to be ineffective and slower than
+    #    a simple random shuffling)
+    # 3) pass that as input for xargs
+    #    a) use -P with number of processors to run the commands in parallel
+    #    b) use -n to set the maximum number of files per process, this number
+    #       is computed to equally distribute the files across the workers
+    sh "#{rubocop_bin} -L | sort -R | xargs -P`nproc` -n$(expr `#{rubocop_bin} -L | wc -l` / " \
+      "`nproc` + 1) #{rubocop_bin} #{params}"
+  end
 end
 
 namespace :check do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yast-rake
 version: !ruby/object:Gem::Version
-  version: 0.2.43
+  version: 0.2.46
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks