From b216f7a438aa53fe5324219a3db0108fea854da3 Mon Sep 17 00:00:00 2001 From: archanaserver Date: Tue, 21 Nov 2023 02:05:34 +0530 Subject: [PATCH] Update matrix version --- .github/workflows/ci.yaml | 12 +++++++----- lib/kafo/kafo_configure.rb | 2 +- lib/kafo/param.rb | 2 +- lib/kafo/progress_bar.rb | 2 +- modules/kafo_configure/metadata.json | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cbc008e7..9cef46f8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 }} diff --git a/lib/kafo/kafo_configure.rb b/lib/kafo/kafo_configure.rb index be0a469a..9cbdb709 100644 --- a/lib/kafo/kafo_configure.rb +++ b/lib/kafo/kafo_configure.rb @@ -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) diff --git a/lib/kafo/param.rb b/lib/kafo/param.rb index 363e16b0..cf5047fb 100644 --- a/lib/kafo/param.rb +++ b/lib/kafo/param.rb @@ -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) } diff --git a/lib/kafo/progress_bar.rb b/lib/kafo/progress_bar.rb index a10810e3..ec32f714 100644 --- a/lib/kafo/progress_bar.rb +++ b/lib/kafo/progress_bar.rb @@ -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)) diff --git a/modules/kafo_configure/metadata.json b/modules/kafo_configure/metadata.json index d9ba1ffd..6f49b472 100644 --- a/modules/kafo_configure/metadata.json +++ b/modules/kafo_configure/metadata.json @@ -9,7 +9,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.5.0 < 8.0.0" + "version_requirement": ">= 4.5.0 < 9.0.0" } ] }