From f6e8bc45741d760005801e04bd186ab8bcf914d6 Mon Sep 17 00:00:00 2001
From: Hugo Haakseth <hugo.haakseth@spk.no>
Date: Tue, 23 Apr 2024 11:25:10 +0200
Subject: [PATCH] Support arbitrary inputs to reusable workflow files

---
 moduleroot/.github/workflows/ci.yml.erb      | 12 +++++++++++-
 moduleroot/.github/workflows/release.yml.erb |  5 +++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/moduleroot/.github/workflows/ci.yml.erb b/moduleroot/.github/workflows/ci.yml.erb
index 6bc1ef09..801c2e1e 100644
--- 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
index b41fd29b..c4d598b8 100644
--- 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: