Skip to content

Commit

Permalink
Merge pull request #14 from voxpupuli/modulesync
Browse files Browse the repository at this point in the history
modulesync 2023-09-07
  • Loading branch information
zilchms authored Sep 7, 2023
2 parents 6d42bb4 + fb7c99b commit 96cf8ae
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 26 deletions.
17 changes: 0 additions & 17 deletions .github/dependabot.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'voxpupuli'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Ruby 3.0
uses: ruby/setup-ruby@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
rubocop:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -37,7 +37,7 @@ jobs:
COVERAGE: ${{ matrix.coverage }}
name: Ruby ${{ matrix.ruby }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
Expand Down
3 changes: 1 addition & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
---
inherit_from: .rubocop_todo.yml

# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

inherit_from: .rubocop_todo.yml
inherit_gem:
voxpupuli-rubocop: rubocop.yml

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ group :development do
gem 'rspec', '~> 3.12'
gem 'rspec-collection_matchers', '~> 1.2'
gem 'rspec-its', '~> 1.3'
gem 'voxpupuli-rubocop', '~> 1.1'
gem 'voxpupuli-rubocop', '~> 2.0'
end
6 changes: 3 additions & 3 deletions spec/puppet-lint/plugins/check_optional_default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
expect(problems).to have(1).problem
end

col = (type == 'class' ? 21 : 22)
col = ((type == 'class') ? 21 : 22)
it 'creates a warning' do
expect(problems).to contain_warning(msg).on_line(1).in_column(col)
end
Expand All @@ -25,7 +25,7 @@
expect(problems).to have(1).problem
end

col = (type == 'class' ? 21 : 22)
col = ((type == 'class') ? 21 : 22)
it 'creates a warning' do
expect(problems).to contain_warning(msg).on_line(1).in_column(col)
end
Expand Down Expand Up @@ -74,7 +74,7 @@
expect(problems).to have(1).problem
end

col = (type == 'class' ? 32 : 33)
col = ((type == 'class') ? 32 : 33)
it 'creates a warning' do
expect(problems).to contain_warning(msg).on_line(1).in_column(col)
end
Expand Down

0 comments on commit 96cf8ae

Please sign in to comment.