yast-rake 0.2.44 → 0.2.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b131d89f00dea687fc5d44232d1cf6ce503659ca2ca810d63b17169d69eb5e00
-  data.tar.gz: 1e2d455ac8ca10a363b7bf89585f8bf0927dd06c94204d222a1384f421b4270d
+  metadata.gz: 84beac8fc61a64c1e2395c3bf9353b3af7d82a8114a8ca8bb54ba04d0eb3a5c6
+  data.tar.gz: 5b2030a73eb9a16e4295d378e9a9820ecb01b149281270cccbd890b54f3fd3d0
 SHA512:
-  metadata.gz: 5a83c6e94d862c23c0f04e84cdf68d48c0aa4b4f51caba4000a6f5106831097c38343b10a553fc83fd3355e37a9b719befab007656b3a1626b2364b76f8db35a
-  data.tar.gz: 13828bd3771752722aa0fe5eb0c7f8f305b6f447bf8f0310e71c5df33e4810d5f071fa2cdef39cbcdfc17a2eff2e9e4e12b2f37675aff1c6fbda0d5d4b1b9a24
+  metadata.gz: 37383c8f09a3e8bbfff98918581fd450454ad2987fe055719e1a1a0bd1055cd30155d009ee498c3863fa56212f1f5c8be387b8f17d3b32bc806d237c317e9a1a
+  data.tar.gz: 455c0771c116675915339edeadf390e72bd9537cc09d6a4dae9b8746b906a6fa2ec8896d7df9562a2b673e27585cceb8d2b5df314966f87da7bd908379cc4b11

data/VERSION

@@ -1 +1 @@
-0.2.44
+0.2.47

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/yast/rake.rb

@@ -22,14 +22,19 @@ require_relative "tasks"
 
 # yast integration testing takes too long and require osc:build so it create
 # circle, so replace test dependency with test:unit
-task = Rake::Task["package"]
-prerequisites = task.prerequisites
+ptask = Rake::Task["package"]
+prerequisites = ptask.prerequisites
 prerequisites.delete("test")
 
-task.enhance(prerequisites)
+ptask.enhance(prerequisites)
 
 yast_submit = ENV["YAST_SUBMIT"] || :factory
 Yast::Tasks.submit_to(yast_submit.to_sym)
+namespace :osc do
+  # This adds to existing desc
+  desc "Try YAST_SUBMIT=help rake...."
+  task :build
+end
 
 Yast::Tasks.configuration do |conf|
   conf.package_name = File.read("RPMNAME").strip if File.exist?("RPMNAME")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yast-rake
 version: !ruby/object:Gem::Version
-  version: 0.2.44
+  version: 0.2.47
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks