fixup: even more cleanup

voxpupuli · May 8, 2024 · 71b96a7 · 71b96a7
1 parent 0517b40
commit 71b96a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/moduleroot/.github/workflows/ci.yml.erb b/moduleroot/.github/workflows/ci.yml.erb
@@ -21,18 +21,9 @@ jobs:
     name: Puppet
 <%- if @configs['acceptance_tests'] && Dir[File.join(@metadata[:workdir], 'spec', 'acceptance', '**', '*_spec.rb')].any? -%>
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
-<%- if @configs['with'] -%>
-    with:
-<%- @configs['with'].each do |k,v| -%>
-<%- if v.is_a?(String) -%>
-      <%= k %>: '<%= v %>'
-<%- else -%>
-      <%= k %>: <%= v %>
-<%- end -%>
-<%- end -%>
-<%- end -%>
 <%- else -%>
     uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2
+<%- end -%>
 <%- if @configs['with'] -%>
     with:
 <%- @configs['with'].each do |k,v| -%>
@@ -43,4 +34,3 @@ jobs:
 <%- end -%>
 <%- end -%>
 <%- end -%>
-<%- end -%>
diff --git a/moduleroot/.github/workflows/release.yml.erb b/moduleroot/.github/workflows/release.yml.erb
@@ -23,7 +23,7 @@ jobs:
 <%- end -%>
 <%- end -%>
 <%- end -%>
-<%- if @configs['with'].nil? || !@configs['with'].has_key?('allowed_owner') -%>
+<%- unless @configs['with']&.has_key?('allowed_owner') -%>
       allowed_owner: '<%= @configs[:namespace] %>'
 <%- end -%>
     secrets: