From 66715064a5beafe7190ddd285bfe7fe89d012dfc Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 25 May 2024 17:47:15 +0200 Subject: [PATCH] Require Ruby 3.1 or newer Ruby 3.0 and older are EoL. Also latest PathSpec and minitar dropped support for Ruby 3.0. --- .github/workflows/ci.yml | 10 ++++------ .rubocop.yml | 3 +++ puppet-modulebuilder.gemspec | 5 ++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1d4a72..22ccaea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,11 +18,10 @@ jobs: fail-fast: false matrix: ruby_version: - - "2.7" + - "3.3" - "3.2" + - "3.1" include: - - ruby-version: '2.7' - puppet_gem_version: '~> 7.0' - ruby_version: '3.2' puppet_gem_version: '~> 8.0' # puppet8' runs_on: @@ -42,11 +41,10 @@ jobs: strategy: matrix: ruby_version: - - "2.7" + - "3.3" - "3.2" + - "3.1" include: - - ruby-version: '2.7' - puppet_gem_version: '~> 7.0' - ruby_version: '3.2' puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8' runs_on: diff --git a/.rubocop.yml b/.rubocop.yml index 54ef1db..39cd9ef 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,3 +7,6 @@ inherit_gem: # Disabled Style/ClassAndModuleChildren: Enabled: false + +AllCops: + TargetRubyVersion: '3.1' diff --git a/puppet-modulebuilder.gemspec b/puppet-modulebuilder.gemspec index a8c933d..026b0d0 100644 --- a/puppet-modulebuilder.gemspec +++ b/puppet-modulebuilder.gemspec @@ -25,9 +25,8 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] # minitar and pathspec is required for building Puppet modules spec.add_runtime_dependency 'minitar', '~> 0.9' - spec.add_runtime_dependency 'pathspec', '>= 0.2.1', '< 3.0.0' + spec.add_runtime_dependency 'pathspec', '~> 2.1' spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.8.0' - - spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0') + spec.required_ruby_version = '>= 3.1' end