Skip to content

Commit 491ca2b

Browse files
wyardleybastelfreak
wyardley
authored and
bastelfreak
committed
modulesync 7.5.0
1 parent 2b309fb commit 491ca2b

File tree

12 files changed

+95
-127
lines changed

12 files changed

+95
-127
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,29 @@ You can install all needed gems for spec tests into the modules directory by
131131
running:
132132

133133
```sh
134-
bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
134+
bundle config set --local path '.vendor/'
135+
bundle config set --local without 'development system_tests release'
136+
bundle install --jobs "$(nproc)"
135137
```
136138

137139
If you also want to run acceptance tests:
138140

139141
```sh
140-
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
142+
bundle config set --local path '.vendor/'
143+
bundle config set --local without 'development release'
144+
bundle config set --local with 'system_tests'
145+
bundle install --jobs "$(nproc)"
141146
```
142147

143148
Our all in one solution if you don't know if you need to install or update gems:
144149

145150
```sh
146-
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
151+
bundle config set --local path '.vendor/'
152+
bundle config set --local without 'development release'
153+
bundle config set --local with 'system_tests'
154+
bundle install --jobs "$(nproc)"
155+
bundle update
156+
bundle clean
147157
```
148158

149159
As an alternative to the `--jobs "$(nproc)` parameter, you can set an
@@ -232,18 +242,21 @@ simple tests against it after applying the module. You can run this
232242
with:
233243

234244
```sh
235-
BEAKER_setfile=debian11-64 bundle exec rake beaker
245+
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
236246
```
237247

238-
You can replace the string `debian10` with any common operating system.
248+
You can replace the string `debian11` with any common operating system.
239249
The following strings are known to work:
240250

241-
* ubuntu1804
242251
* ubuntu2004
243-
* debian10
252+
* ubuntu2204
244253
* debian11
245254
* centos7
246255
* centos8
256+
* centos9
257+
* almalinux8
258+
* almalinux9
259+
* fedora36
247260

248261
For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
249262

‎.github/SECURITY.md‎

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

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44

55
name: CI
66

7-
on: pull_request
7+
on:
8+
pull_request: {}
9+
push:
10+
branches:
11+
- main
12+
- master
813

914
concurrency:
1015
group: ${{ github.ref_name }}
@@ -13,6 +18,6 @@ concurrency:
1318
jobs:
1419
puppet:
1520
name: Puppet
16-
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
21+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
1722
with:
1823
pidfile_workaround: 'false'

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
release:
1414
name: Release
15-
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
15+
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
1616
with:
1717
allowed_owner: 'voxpupuli'
1818
secrets:

‎.gitignore‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
# Managed by modulesync - DO NOT EDIT
22
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
33

4-
pkg/
5-
Gemfile.lock
6-
Gemfile.local
7-
vendor/
8-
.vendor/
9-
spec/fixtures/manifests/
10-
spec/fixtures/modules/
11-
.vagrant/
12-
.bundle/
13-
.ruby-version
14-
coverage/
15-
log/
16-
.idea/
17-
.dependencies/
18-
.librarian/
19-
Puppetfile.lock
4+
/pkg/
5+
/Gemfile.lock
6+
/Gemfile.local
7+
/vendor/
8+
/.vendor/
9+
/spec/fixtures/manifests/
10+
/spec/fixtures/modules/
11+
/.vagrant/
12+
/.bundle/
13+
/.ruby-version
14+
/coverage/
15+
/log/
16+
/.idea/
17+
/.dependencies/
18+
/.librarian/
19+
/Puppetfile.lock
2020
*.iml
2121
.*.sw?
22-
.yardoc/
23-
Guardfile
22+
/.yardoc/
23+
/Guardfile
24+
bolt-debug.log
25+
.rerun.json

‎.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: '5.2.0'
5+
modulesync_config_version: '7.5.0'

‎.pmtignore‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
# Managed by modulesync - DO NOT EDIT
22
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
33

4-
docs/
5-
pkg/
6-
Gemfile
7-
Gemfile.lock
8-
Gemfile.local
9-
vendor/
10-
.vendor/
11-
spec/
12-
Rakefile
13-
.vagrant/
14-
.bundle/
15-
.ruby-version
16-
coverage/
17-
log/
18-
.idea/
19-
.dependencies/
20-
.github/
21-
.librarian/
22-
Puppetfile.lock
4+
/docs/
5+
/pkg/
6+
/Gemfile
7+
/Gemfile.lock
8+
/Gemfile.local
9+
/vendor/
10+
/.vendor/
11+
/spec/
12+
/Rakefile
13+
/.vagrant/
14+
/.bundle/
15+
/.ruby-version
16+
/coverage/
17+
/log/
18+
/.idea/
19+
/.dependencies/
20+
/.github/
21+
/.librarian/
22+
/Puppetfile.lock
2323
*.iml
24-
.editorconfig
25-
.fixtures.yml
26-
.gitignore
27-
.msync.yml
28-
.overcommit.yml
29-
.pmtignore
30-
.rspec
31-
.rspec_parallel
32-
.rubocop.yml
33-
.sync.yml
24+
/.editorconfig
25+
/.fixtures.yml
26+
/.gitignore
27+
/.msync.yml
28+
/.overcommit.yml
29+
/.pmtignore
30+
/.rspec
31+
/.rspec_parallel
32+
/.rubocop.yml
33+
/.sync.yml
3434
.*.sw?
35-
.yardoc/
36-
.yardopts
37-
Dockerfile
35+
/.yardoc/
36+
/.yardopts
37+
/Dockerfile
38+
/HISTORY.md

‎.rubocop.yml‎

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

5+
inherit_from: .rubocop_todo.yml
56
inherit_gem:
67
voxpupuli-test: rubocop.yml

‎Dockerfile‎

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

‎Gemfile‎

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

66
group :test do
7-
gem 'voxpupuli-test', '~> 5.0', :require => false
7+
gem 'voxpupuli-test', '~> 7.0', :require => false
88
gem 'coveralls', :require => false
99
gem 'simplecov-console', :require => false
10-
gem 'puppet_metadata', '~> 1.0', :require => false
10+
gem 'puppet_metadata', '~> 3.5', :require => false
1111
end
1212

1313
group :development do
@@ -16,19 +16,17 @@ group :development do
1616
end
1717

1818
group :system_tests do
19-
gem 'voxpupuli-acceptance', '~> 1.0', :require => false
19+
gem 'voxpupuli-acceptance', '~> 3.0', :require => false
2020
end
2121

2222
group :release do
23-
gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5'
24-
gem 'voxpupuli-release', '>= 1.2.0', :require => false
25-
gem 'puppet-strings', '>= 2.2', :require => false
23+
gem 'voxpupuli-release', '~> 3.0', :require => false
2624
end
2725

2826
gem 'rake', :require => false
2927
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
3028

31-
puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
29+
puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
3230
gem 'puppet', puppetversion, :require => false, :groups => [:test]
3331

3432
# vim: syntax=ruby

0 commit comments

Comments
 (0)