Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support arbitrary inputs to reusable workflow files #888

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Support arbitrary inputs to reusable workflow files #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion moduleroot/.github/workflows/ci.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%>
Expand All @@ -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 -%>
Copy link
Contributor Author

@h-haaks h-haaks Apr 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have tested this locally with
bundle exec msync update -f puppet-example --offline --noop where I made two local commits to the master branch of puppet-example.
1: added this to .sync.yml

.github/workflows/ci.yml:
  rubocop: false

2: updated .sync.yml

.github/workflows/ci.yml:
  with:
    rubocop: false

Seems to work as expected.

Copy link
Contributor Author

@h-haaks h-haaks Apr 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's possible to test this change any more on real modules as the changes to .sync.yml has to be merged to main/master for msync to pick it up.
If I added with key and merge it, msync will fail on that module until the PR is merged.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the --noop --offline from the msync call and provide a PR for puppet-example? That's how we usually do it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, as expected it doesn't change anything in the local modulesync branch so it's not pushed ...
The puppet-example doesn't even have .github/workflows/ci.yml in it's sync file.

Do you want me to change puppet-example so that I can generate a diff?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We often (ab)use puppet-example as our testing ground. Feel free to use that. Though with --offline (then --noop is redundant) it should take .sync.yml into account

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I didn't commit my changes to .sync.yml in the local modulsync branch before rerun of msync ...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With --offline it shouldn't care about git and work purely local

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

voxpupuli/puppet-example#45

<%- end -%>
<%- unless @configs['additional_packages'].empty? -%>
additional_packages: '<%= @configs['additional_packages'] %>'
Expand Down
5 changes: 5 additions & 0 deletions moduleroot/.github/workflows/release.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down