Skip to content

Commit 0e5cf30

Browse files
authored
Merge pull request #219 from voxpupuli/modulesync
fix exec idempotency issues
2 parents 025561f + a5515dd commit 0e5cf30

File tree

20 files changed

+59
-299
lines changed

20 files changed

+59
-299
lines changed

.devcontainer/devcontainer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "VoxBox",
3+
"image": "ghcr.io/voxpupuli/voxbox:latest"
4+
}

.github/CONTRIBUTING.md

Lines changed: 0 additions & 272 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ permissions:
2222
jobs:
2323
puppet:
2424
name: Puppet
25-
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
25+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4

.github/workflows/create_tag.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
name: Create Git tag
6+
7+
on:
8+
workflow_dispatch:
9+
10+
permissions: {}
11+
12+
jobs:
13+
create_tag:
14+
uses: 'voxpupuli/gha-puppet/.github/workflows/create_tag.yml@v4'
15+
with:
16+
allowed_owner: 'voxpupuli'
17+
git_name: 'pccibot'
18+
git_email: '12855858+pccibot@users.noreply.github.com'
19+
secrets:
20+
# Configure secrets here:
21+
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
22+
ssh_private_key: ${{ secrets.PCCI_SSH_PRIVATE_KEY }}

.github/workflows/prepare_release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ permissions:
1717

1818
jobs:
1919
release_prep:
20-
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
20+
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v4'
2121
with:
2222
version: ${{ github.event.inputs.version }}
2323
allowed_owner: 'voxpupuli'
24+
git_name: 'pccibot'
25+
git_email: '12855858+pccibot@users.noreply.github.com'
2426
secrets:
2527
# Configure secrets here:
2628
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
2729
github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'
30+
ssh_private_key: '${{ secrets.PCCI_SSH_PRIVATE_KEY }}'

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ name: Release
88
on:
99
push:
1010
tags:
11-
- '*'
11+
# https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#onpushbranchestagsbranches-ignoretags-ignore
12+
# https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet
13+
- 'v[0-9]+.[0-9]+.[0-9]+'
1214

1315
permissions:
1416
contents: write
1517

1618
jobs:
1719
release:
1820
name: Release
19-
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
21+
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v4
2022
with:
2123
allowed_owner: 'voxpupuli'
2224
secrets:

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '10.1.0'
5+
modulesync_config_version: '10.7.0'

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 11.0', :require => false
8-
gem 'puppet_metadata', '~> 5.0', :require => false
7+
gem 'voxpupuli-test', '~> 14.0', :require => false
8+
gem 'puppet_metadata', '~> 6.0', :require => false
99
end
1010

1111
group :development do
@@ -18,7 +18,7 @@ group :system_tests do
1818
end
1919

2020
group :release do
21-
gem 'voxpupuli-release', '~> 4.0', :require => false
21+
gem 'voxpupuli-release', '~> 5.3', :require => false
2222
end
2323

2424
gem 'rake', :require => false

lib/puppet/provider/rvm_gem/gem.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def gemlist(hash)
3535
end
3636

3737
if (name = hash[:justme])
38-
command << ("^#{name}$")
38+
command << "^#{name}$"
3939
end
4040

4141
# use proxy if proxy_url is set
@@ -69,7 +69,7 @@ def self.gemsplit(desc)
6969
version = Regexp.last_match(2).split(%r{,\s*})
7070
{
7171
name: name,
72-
ensure: version
72+
ensure: version,
7373
}
7474
else
7575
Puppet.warning "Could not match #{desc}"

lib/puppet/type/rvm_system_ruby.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
1, 'read', 'read-only',
4040
2, 'fail', 'read-fail',
4141
3, 'packages', 'install-packages',
42-
4, 'enable', 'enabled'
42+
4, 'enable', 'enabled',
4343
]
4444

4545
raise("Invalid autolib mode: #{value}") unless modes.include? value

0 commit comments

Comments
 (0)