Skip to content

Commit 33ec602

Browse files
authored
Merge pull request saz#311 from saz/modulesync
Update module config
2 parents 6bed886 + c8e0a06 commit 33ec602

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+534
-774
lines changed

.editorconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# editorconfig.org
2+
3+
# MANAGED BY MODULESYNC
4+
5+
root = true
6+
7+
[*]
8+
charset = utf-8
9+
end_of_line = lf
10+
indent_size = 2
11+
tab_width = 2
12+
indent_style = space
13+
insert_final_newline = true
14+
trim_trailing_whitespace = true

.github/workflows/ci.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: CI
2+
3+
on:
4+
- pull_request
5+
- push
6+
7+
jobs:
8+
setup_matrix:
9+
name: 'Setup Test Matrix'
10+
runs-on: ubuntu-latest
11+
timeout-minutes: 40
12+
outputs:
13+
beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
14+
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
15+
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
16+
env:
17+
BUNDLE_WITHOUT: development:release
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Setup ruby
21+
uses: ruby/setup-ruby@v1
22+
with:
23+
ruby-version: '2.7'
24+
bundler-cache: true
25+
- name: Run rake validate
26+
run: bundle exec rake validate
27+
- name: Run rake rubocop
28+
run: bundle exec rake rubocop
29+
- name: Setup Test Matrix
30+
id: get-outputs
31+
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false
32+
33+
unit:
34+
needs: setup_matrix
35+
runs-on: ubuntu-latest
36+
timeout-minutes: 40
37+
strategy:
38+
fail-fast: false
39+
matrix:
40+
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
41+
env:
42+
BUNDLE_WITHOUT: development:system_tests:release
43+
PUPPET_VERSION: "~> ${{ matrix.puppet }}.0"
44+
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
45+
steps:
46+
- uses: actions/checkout@v2
47+
- name: Setup ruby
48+
uses: ruby/setup-ruby@v1
49+
with:
50+
ruby-version: ${{ matrix.ruby }}
51+
bundler-cache: true
52+
- name: Run tests
53+
run: bundle exec rake

.github/workflows/release.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
env:
9+
BUNDLE_WITHOUT: development:test:system_tests
10+
11+
jobs:
12+
deploy:
13+
name: 'deploy to forge'
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v2
18+
- name: Setup Ruby
19+
uses: ruby/setup-ruby@v1
20+
with:
21+
ruby-version: '2.7'
22+
bundler-cache: true
23+
- name: Build and Deploy
24+
env:
25+
# Configure secrets here:
26+
# https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
27+
BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}'
28+
BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}'
29+
run: bundle exec rake module:push

.gitignore

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
pkg/
2-
*.swp
3-
.DS_Store
42
Gemfile.lock
3+
Gemfile.local
54
vendor/
65
.vendor/
6+
spec/fixtures/manifests/
7+
spec/fixtures/modules/
8+
.vagrant/
79
.bundle/
10+
.ruby-version
11+
coverage/
12+
log/
13+
.idea/
14+
.dependencies/
15+
.librarian/
16+
Puppetfile.lock
17+
*.iml
18+
.*.sw?
19+
.yardoc/
20+
Guardfile

.msync.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
modulesync_config_version: '4.1.0'

.overcommit.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Managed by https://github.com/voxpupuli/modulesync_configs
2+
#
3+
# Hooks are only enabled if you take action.
4+
#
5+
# To enable the hooks run:
6+
#
7+
# ```
8+
# bundle exec overcommit --install
9+
# # ensure .overcommit.yml does not harm to you and then
10+
# bundle exec overcommit --sign
11+
# ```
12+
#
13+
# (it will manage the .git/hooks directory):
14+
#
15+
# Examples howto skip a test for a commit or push:
16+
#
17+
# ```
18+
# SKIP=RuboCop git commit
19+
# SKIP=PuppetLint git commit
20+
# SKIP=RakeTask git push
21+
# ```
22+
#
23+
# Don't invoke overcommit at all:
24+
#
25+
# ```
26+
# OVERCOMMIT_DISABLE=1 git commit
27+
# ```
28+
#
29+
# Read more about overcommit: https://github.com/brigade/overcommit
30+
#
31+
# To manage this config yourself in your module add
32+
#
33+
# ```
34+
# .overcommit.yml:
35+
# unmanaged: true
36+
# ```
37+
#
38+
# to your modules .sync.yml config
39+
---
40+
PreCommit:
41+
RuboCop:
42+
enabled: true
43+
description: 'Runs rubocop on modified files only'
44+
command: ['bundle', 'exec', 'rubocop']
45+
PuppetLint:
46+
enabled: true
47+
description: 'Runs puppet-lint on modified files only'
48+
command: ['bundle', 'exec', 'puppet-lint']
49+
YamlSyntax:
50+
enabled: true
51+
JsonSyntax:
52+
enabled: true
53+
TrailingWhitespace:
54+
enabled: true
55+
56+
PrePush:
57+
RakeTarget:
58+
enabled: true
59+
description: 'Run rake targets'
60+
targets:
61+
- 'validate'
62+
- 'test'
63+
- 'rubocop'
64+
command: ['bundle', 'exec', 'rake']

.pmtignore

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
docs/
22
pkg/
3+
Gemfile
34
Gemfile.lock
45
Gemfile.local
56
vendor/
67
.vendor/
7-
spec/fixtures/manifests/
8-
spec/fixtures/modules/
8+
spec/
9+
Rakefile
910
.vagrant/
1011
.bundle/
1112
.ruby-version
1213
coverage/
1314
log/
1415
.idea/
1516
.dependencies/
17+
.github/
1618
.librarian/
1719
Puppetfile.lock
1820
*.iml
21+
.editorconfig
22+
.fixtures.yml
23+
.gitignore
24+
.msync.yml
25+
.overcommit.yml
26+
.pmtignore
27+
.rspec
28+
.rspec_parallel
29+
.rubocop.yml
30+
.sync.yml
1931
.*.sw?
2032
.yardoc/
33+
.yardopts
34+
Dockerfile

.rspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
--format documentation
2+
--color

.rspec_parallel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--format progress

0 commit comments

Comments
 (0)