Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ruby 3.0 + Puppet 7 & 3.2 + Puppet 8 to CI #369

Merged
merged 1 commit into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby:
- "2.7"
puppet:
- "7"

include:
- ruby: '2.7'
puppet: '7'
- ruby: '3.0'
puppet: '7'
- ruby: '3.2'
puppet: '8'
env:
PUPPET_VERSION: ${{ matrix.puppet }}

Expand Down
2 changes: 1 addition & 1 deletion lib/kafo/kafo_configure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def initialize(*args)
request_config_reload if applied_total > 0

if ARGV.include?('--migrations-only')
verbose = (ARGV.include?('--verbose') || ARGV.include?('-v'))
verbose = ARGV.include?('--verbose') || ARGV.include?('-v')
Logging.setup(verbose: verbose)
self.class.logger.notice('Log buffers flushed')
self.class.exit(0)
Expand Down
2 changes: 1 addition & 1 deletion lib/kafo/param.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def interpret_validation_args(args)

def normalize_value(value)
case value
when ::HighLine::String # don't persist highline extensions
when ::HighLine::String # don't persist highline extensions
value.to_s
when Array
value.map { |v| normalize_value(v) }
Expand Down
2 changes: 1 addition & 1 deletion lib/kafo/progress_bar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def update(line)
@all_lines += 1

# we print every 20th line during installation preparing otherwise only update at EVALTRACE_START
update_bar = (@total == :unknown && @all_lines % 20 == 0)
update_bar = @total == :unknown && @all_lines % 20 == 0
force_update = false

if (line_monitor = MONITOR_RESOURCE.match(line))
Expand Down
2 changes: 1 addition & 1 deletion modules/kafo_configure/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.5.0 < 8.0.0"
"version_requirement": ">= 4.5.0 < 9.0.0"
}
]
}