Skip to content

Commit e0613ff

Browse files
authored
Merge pull request #409 from puppetlabs/CAT-1430-bump_puppet-lint_dependency
(CAT-1430) - Require puppet-lint ~> 4.0
2 parents 9ecb7ab + 1a42c20 commit e0613ff

File tree

3 files changed

+55
-1
lines changed

3 files changed

+55
-1
lines changed

.github/workflows/ci.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,32 @@ on:
88

99
jobs:
1010
spec:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
ruby_version:
15+
- '2.7'
16+
- '3.2'
1117
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
1218
secrets: "inherit"
19+
with:
20+
ruby_version: ${{ matrix.ruby_version }}
21+
22+
acceptance:
23+
needs: spec
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
ruby_version:
28+
- '2.7'
29+
- '3.2'
30+
include:
31+
- ruby_version: '2.7'
32+
puppet_version: '~> 7.0'
33+
- ruby_version: '3.2'
34+
puppet_version: '~> 8.0'
35+
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
36+
secrets: "inherit"
37+
with:
38+
ruby_version: ${{ matrix.ruby_version }}
39+
puppet_version: ${{ matrix.puppet_version }}

.github/workflows/nightly.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,32 @@ on:
77

88
jobs:
99
spec:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
ruby_version:
14+
- '2.7'
15+
- '3.2'
1016
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
1117
secrets: "inherit"
18+
with:
19+
ruby_version: ${{ matrix.ruby_version }}
20+
21+
acceptance:
22+
needs: spec
23+
strategy:
24+
fail-fast: false
25+
matrix:
26+
ruby_version:
27+
- '2.7'
28+
- '3.2'
29+
include:
30+
- ruby_version: '2.7'
31+
puppet_version: '~> 7.0'
32+
- ruby_version: '3.2'
33+
puppet_version: '~> 8.0'
34+
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
35+
secrets: "inherit"
36+
with:
37+
ruby_version: ${{ matrix.ruby_version }}
38+
puppet_version: ${{ matrix.puppet_version }}

puppetlabs_spec_helper.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
3030

3131
spec.add_runtime_dependency 'mocha', '~> 1.0'
3232
spec.add_runtime_dependency 'pathspec', '>= 0.2', '< 2.0.0'
33-
spec.add_runtime_dependency 'puppet-lint', '>= 3.0.0'
33+
spec.add_runtime_dependency 'puppet-lint', '~> 4.0'
3434
spec.add_runtime_dependency 'puppet-syntax', '~> 3.0'
3535
spec.add_runtime_dependency 'rspec-github', '~> 2.0'
3636
spec.add_runtime_dependency 'rspec-puppet', '>= 2.0'

0 commit comments

Comments
 (0)