File tree Expand file tree Collapse file tree 6 files changed +25
-49
lines changed Expand file tree Collapse file tree 6 files changed +25
-49
lines changed Original file line number Diff line number Diff line change @@ -17,28 +17,13 @@ jobs:
17
17
puppet_gem_version :
18
18
- ' ~> 6.0'
19
19
- ' ~> 7.0'
20
- name : " spec (ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
20
+ runs_on :
21
+ - " ubuntu-latest"
22
+ - " windows-latest"
23
+ name : " spec (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
21
24
uses : " puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
22
25
secrets : " inherit"
23
26
with :
24
27
ruby_version : ${{ matrix.ruby_version }}
25
28
puppet_gem_version : ${{ matrix.puppet_gem_version }}
26
-
27
- acceptance :
28
- needs : " spec"
29
- strategy :
30
- fail-fast : false
31
- matrix :
32
- os :
33
- - " ubuntu-latest"
34
- - " windows-2019"
35
- ruby_version :
36
- - " 2.5"
37
- - " 2.7"
38
- name : " acceptance (${{ matrix.os }} | ruby ${{ matrix.ruby_version }})"
39
- uses : " puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
40
- secrets : " inherit"
41
- with :
42
- ruby_version : ${{ matrix.ruby_version }}
43
- rake_task : ' acceptance:local_parallel'
44
- runs_on : ${{ matrix.os }}
29
+ runs_on : ${{ matrix.runs_on }}
Original file line number Diff line number Diff line change @@ -16,27 +16,13 @@ jobs:
16
16
puppet_gem_version :
17
17
- ' ~> 6.0'
18
18
- ' ~> 7.0'
19
- name : " spec (ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
20
- uses : " puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
21
- secrets : " inherit"
22
- with :
23
- ruby_version : ${{ matrix.ruby_version }}
24
-
25
- acceptance :
26
- needs : " spec"
27
- strategy :
28
- fail-fast : false
29
- matrix :
30
- os :
19
+ runs_on :
31
20
- " ubuntu-latest"
32
- - " windows-2019"
33
- ruby_version :
34
- - " 2.5"
35
- - " 2.7"
36
- name : " acceptance (ruby ${{ matrix.ruby_version }} | ${{ matrix.os }})"
37
- uses : " puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
21
+ - " windows-latest"
22
+ name : " spec (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
23
+ uses : " puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
38
24
secrets : " inherit"
39
25
with :
40
26
ruby_version : ${{ matrix.ruby_version }}
41
- rake_task : ' acceptance:local_parallel '
42
- runs_on : ${{ matrix.os }}
27
+ puppet_gem_version : ${{ matrix.puppet_gem_version }}
28
+ runs_on : ${{ matrix.runs_on }}
Original file line number Diff line number Diff line change
1
+ # Silencing rubocop warnings until https://tickets.puppetlabs.com/browse/CONT-725
2
+ # is completed
3
+ AllCops :
4
+ DisabledByDefault : true
Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ if RUBY_VERSION =~ /^1\.?9/
17
17
gem 'ffi' , '<= 1.9.14'
18
18
end
19
19
20
- gem 'rspec' , *location_for ( ENV [ 'RSPEC_GEM_VERSION' ] || '~> 3.0' )
21
- gem 'puppet' , *location_for ( ENV [ 'PUPPET_GEM_VERSION' ] || '~> 7.0' )
22
- gem 'facter' , *location_for ( ENV [ 'FACTER_GEM_VERSION' ] || '~> 4.0' )
20
+ gem 'rspec' , *location_for ( ! ENV [ 'RSPEC_GEM_VERSION' ] &. empty? ? ENV [ 'RSPEC_GEM_VERSION' ] : '~> 3.0' )
21
+ gem 'puppet' , *location_for ( ! ENV [ 'PUPPET_GEM_VERSION' ] &. empty? ? ENV [ 'PUPPET_GEM_VERSION' ] : '~> 7.0' )
22
+ gem 'facter' , *location_for ( ! ENV [ 'FACTER_GEM_VERSION' ] &. empty? ? ENV [ 'FACTER_GEM_VERSION' ] : '~> 4.0' )
23
23
gem 'pry' , :group => :development
24
24
25
25
if RUBY_VERSION =~ /^1\. ?/
Original file line number Diff line number Diff line change 1
1
require 'rake'
2
2
require 'rspec/core/rake_task'
3
+ require 'rubocop/rake_task'
3
4
require 'bundler/gem_tasks'
4
5
require 'fileutils'
5
6
require 'puppet'
@@ -89,3 +90,7 @@ task :test do
89
90
Rake ::Task [ 'test:teardown' ] . invoke
90
91
end
91
92
end
93
+
94
+ RuboCop ::RakeTask . new ( :rubocop ) do |task |
95
+ task . options = %w[ -D -S -E ]
96
+ end
Original file line number Diff line number Diff line change 1
1
require 'spec_helper'
2
2
3
3
describe 'test::registry' , :if => Puppet . version . to_f >= 4.0 do
4
- let ( :facts ) do
5
- {
6
- :operatingsystem => 'windows' ,
7
- }
8
- end
9
-
4
+ let ( :facts ) { { :os => { :name => 'windows' } } }
5
+
10
6
it { should compile . with_all_deps }
11
7
end
You can’t perform that action at this time.
0 commit comments