Skip to content

Commit

Permalink
Merge pull request #855 from ekohl/update-to-gha-puppet-v2
Browse files Browse the repository at this point in the history
Update to gha-puppet v2
  • Loading branch information
bastelfreak authored Oct 18, 2023
2 parents 27886f8 + 72f3444 commit 4b75625
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ Gemfile:
- gem: coveralls
- gem: simplecov-console
- gem: puppet_metadata
version: '~> 3.0'
version: '~> 3.5'
':development':
- gem: guard-rake
- gem: overcommit
version: '>= 0.39.1'
':system_tests':
- gem: voxpupuli-acceptance
version: '~> 2.0'
version: '~> 2.2'
':release':
- gem: voxpupuli-release
version: '~> 3.0'
Expand Down
4 changes: 2 additions & 2 deletions moduleroot/.github/workflows/ci.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
puppet:
name: Puppet
<%- if @configs['acceptance_tests'] && Dir[File.join(@metadata[:workdir], 'spec', 'acceptance', '**', '*_spec.rb')].any? -%>
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
with:
pidfile_workaround: '<%= @configs['pidfile_workaround'] %>'
<%- if @configs['unit_runs_on'] -%>
Expand All @@ -24,7 +24,7 @@ jobs:
acceptance_runs_on: '<%= @configs['acceptance_runs_on'] %>'
<%- end -%>
<%- else -%>
uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v1
uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2
<%- if @configs.key?('rubocop') || !@configs['additional_packages'].empty? || @configs.key?('unit_runs_on') -%>
with:
<%- end -%>
Expand Down
2 changes: 1 addition & 1 deletion moduleroot/.github/workflows/release.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
release:
name: Release
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
with:
allowed_owner: '<%= @configs[:namespace] %>'
secrets:
Expand Down

0 comments on commit 4b75625

Please sign in to comment.