From 4c1b376d8a52003f07b31062e5a8f96227d9aed1 Mon Sep 17 00:00:00 2001 From: Sam Pearson Date: Fri, 10 Feb 2023 15:46:04 +0000 Subject: [PATCH 1/3] Drop support for Ruby 2.5 This is ahead of adding support for `puppet_forge` >= 4.0.0, which in turn adds support for `faraday` 2.x which is its turn requires at least Ruby 2.6. --- .github/workflows/test.yml | 1 - librarian-puppet.gemspec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f2dc14a..5f848f1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,6 @@ jobs: fail-fast: false matrix: ruby: - - "2.5" - "2.6" - "2.7" - "3.0" diff --git a/librarian-puppet.gemspec b/librarian-puppet.gemspec index 3e9afd3..73f0e1e 100644 --- a/librarian-puppet.gemspec +++ b/librarian-puppet.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| automatically pulling in modules from the forge and git repositories with a single command.' - s.required_ruby_version = '>= 2.5.0', '< 4' + s.required_ruby_version = '>= 2.6.0', '< 4' s.files = [ '.gitignore', From e887ac0cbf4a98f0044f7abc5e9ea0609e1b7847 Mon Sep 17 00:00:00 2001 From: Sam Pearson Date: Fri, 10 Feb 2023 15:47:37 +0000 Subject: [PATCH 2/3] Update `puppet_forge` to at least 4.0.0 This updates `puppet_forge`, bringing in an updated `faraday` gem in order to remove some deprecation warnings. Fixes #91 --- librarian-puppet.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librarian-puppet.gemspec b/librarian-puppet.gemspec index 73f0e1e..0e62e5d 100644 --- a/librarian-puppet.gemspec +++ b/librarian-puppet.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |s| s.add_dependency "librarianp", ">=0.6.3" s.add_dependency "rsync" - s.add_dependency "puppet_forge", ">= 2.1", '< 4' + s.add_dependency "puppet_forge", ">= 4.0.0" s.add_development_dependency "rake" s.add_development_dependency "rspec" From 368b4161735473d7d301eb0138f090bcc7d01fbe Mon Sep 17 00:00:00 2001 From: Sam Pearson Date: Mon, 13 Feb 2023 09:44:18 +0000 Subject: [PATCH 3/3] Drop support for Ruby 2.6 and Puppet 5 Both Ruby 2.6 and Puppet 5 are EOL. --- .github/workflows/test.yml | 6 ------ librarian-puppet.gemspec | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5f848f1..166ff4c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,20 +11,14 @@ jobs: fail-fast: false matrix: ruby: - - "2.6" - "2.7" - "3.0" puppet: - "7" - "6" - - "5" exclude: - puppet: "6" ruby: "3.0" - - puppet: "5" - ruby: "3.0" - - puppet: "5" - ruby: "2.7" name: Ruby ${{ matrix.ruby }} + Puppet ${{ matrix.puppet }} env: PUPPET_VERSION: "~> ${{ matrix.puppet }}.0" diff --git a/librarian-puppet.gemspec b/librarian-puppet.gemspec index 0e62e5d..5784d55 100644 --- a/librarian-puppet.gemspec +++ b/librarian-puppet.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| automatically pulling in modules from the forge and git repositories with a single command.' - s.required_ruby_version = '>= 2.6.0', '< 4' + s.required_ruby_version = '>= 2.7.0', '< 4' s.files = [ '.gitignore',