Merge pull request #888 from StatensPensjonskasse/support-arbitrary-i…

…nputs-to-reusable-workflow-files Support arbitrary inputs to reusable workflow files
voxpupuli · Apr 24, 2024 · d18fde4 · d18fde4
2 parents 3e46f99 + f6e8bc4
commit d18fde4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/moduleroot/.github/workflows/ci.yml.erb b/moduleroot/.github/workflows/ci.yml.erb
@@ -23,6 +23,11 @@ jobs:
  uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
  with:
  pidfile_workaround: '<%= @configs['pidfile_workaround'] %>'
+<%- if @configs['with'] -%>
+<%- @configs['with'].each do |k,v| -%>
+ <%= k %>: <%= v %>
+<%- end -%>
+<%- end -%>
 <%- if @configs['unit_runs_on'] -%>
  unit_runs_on: '<%= @configs['unit_runs_on'] %>'
 <%- end -%>
@@ -37,9 +42,14 @@ jobs:
 <%- end -%>
 <%- else -%>
  uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2
-<%- if @configs.key?('rubocop') || !@configs['additional_packages'].empty? || @configs.key?('unit_runs_on') -%>
+<%- if @configs.key?('rubocop') || !@configs['additional_packages'].empty? || @configs.key?('unit_runs_on') || @configs.key?('with') -%>
  with:
 <%- end -%>
+<%- if @configs['with'] -%>
+<%- @configs['with'].each do |k,v| -%>
+ <%= k %>: <%= v %>
+<%- end -%>
+<%- end -%>
 <%- end -%>
 <%- unless @configs['additional_packages'].empty? -%>
  additional_packages: '<%= @configs['additional_packages'] %>'

diff --git a/moduleroot/.github/workflows/release.yml.erb b/moduleroot/.github/workflows/release.yml.erb
@@ -14,6 +14,11 @@ jobs:
  name: Release
  uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
  with:
+<%- if @configs['with'] -%>
+<%- @configs['with'].each do |k,v| -%>
+ <%= k %>: <%= v %>
+<%- end -%>
+<%- end -%>
  allowed_owner: '<%= @configs[:namespace] %>'
  secrets:
  # Configure secrets here: