From 9bf241b03cfd3150d8bb12f925084d4307a689cd Mon Sep 17 00:00:00 2001 From: Aaron Lane <10655063+aaron-lane@users.noreply.github.com> Date: Tue, 14 Mar 2023 22:16:46 -0400 Subject: [PATCH] Drop Ruby 2.7 (#508) * Update action-terragrunt to 1.3.1 * Drop EOL Ruby 2.7 --------- Co-authored-by: Aaron Lane <2400330-aaron-lane@users.noreply.gitlab.com> --- .github/workflows/delivery.yml | 7 +------ CHANGELOG.md | 3 ++- docs/tutorials/amazon_provider_ec2.html | 2 +- gems.rb | 2 +- kitchen-terraform.gemspec | 2 +- source/tutorials/amazon_provider_ec2.html.erb | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/delivery.yml b/.github/workflows/delivery.yml index 63d6d678b..db296d8b0 100644 --- a/.github/workflows/delivery.yml +++ b/.github/workflows/delivery.yml @@ -27,8 +27,6 @@ jobs: fail-fast: false matrix: include: - - operating-system: ubuntu - ruby-version: '2.7' - operating-system: ubuntu ruby-version: '3.0' - operating-system: ubuntu @@ -69,9 +67,6 @@ jobs: fail-fast: false matrix: include: - - code-coverage: false - operating-system: ubuntu - ruby-version: '2.7' - code-coverage: false operating-system: ubuntu ruby-version: '3.0' @@ -156,7 +151,7 @@ jobs: terraform_wrapper: false - name: Setup Terragrunt if: ${{ matrix.operating-system == 'macos' }} - uses: autero1/action-terragrunt@v1.2.0 + uses: autero1/action-terragrunt@v1.3.1 with: terragrunt_version: ${{ matrix.terragrunt-version }} - name: Mirror Terraform Providers diff --git a/CHANGELOG.md b/CHANGELOG.md index 50cae73dc..3ece7a27c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,8 @@ and this project adheres to - `command_timeout` - `root_module_directory` - Dropped support for Inspec < 4.25.1 -- Dropped support for Ruby 2.6 which reach end of life on 2022-04-12. +- Dropped support for Ruby 2.6 which reached end of life on 2022-04-12. +- Dropped support for Ruby 2.7 which reached end of life on 2023-03-31. ## [6.1.0] - 2022-01-22 diff --git a/docs/tutorials/amazon_provider_ec2.html b/docs/tutorials/amazon_provider_ec2.html index 37c5a3066..9a1d21361 100644 --- a/docs/tutorials/amazon_provider_ec2.html +++ b/docs/tutorials/amazon_provider_ec2.html @@ -121,7 +121,7 @@
vim Gemfile
ruby '2.7.1'
+ruby '>= 3.0'
source 'https://rubygems.org/' do
gem 'kitchen-terraform', '~> 6.1'
diff --git a/gems.rb b/gems.rb
index b0df8254e..260ec14fa 100644
--- a/gems.rb
+++ b/gems.rb
@@ -16,7 +16,7 @@
source "https://rubygems.org/"
-ruby ">= 2.7"
+ruby ">= 3.0"
gemspec
diff --git a/kitchen-terraform.gemspec b/kitchen-terraform.gemspec
index e1a51d3d0..47a25b06b 100644
--- a/kitchen-terraform.gemspec
+++ b/kitchen-terraform.gemspec
@@ -45,7 +45,7 @@ require "rubygems"
specification.add_runtime_dependency "test-kitchen", ">= 2.1", "< 4.0"
specification.add_runtime_dependency "tty-which", "~> 0.5.0"
specification.cert_chain = ["certs/gem-public_cert.pem"]
- specification.required_ruby_version = [">= 2.7", "< 4.0"]
+ specification.required_ruby_version = [">= 3.0", "< 4.0"]
specification.requirements = ["Terraform >= v0.11.4, < v2.0.0"]
specification.signing_key = "certs/gem-private_key.pem" if $PROGRAM_NAME =~ /gem\z/
end
diff --git a/source/tutorials/amazon_provider_ec2.html.erb b/source/tutorials/amazon_provider_ec2.html.erb
index 629ec53bc..7880503bf 100644
--- a/source/tutorials/amazon_provider_ec2.html.erb
+++ b/source/tutorials/amazon_provider_ec2.html.erb
@@ -71,7 +71,7 @@ vim Gemfile
Add in the Kitchen-Terraform gem like below (substituting your Ruby version if necessary):
<% code("ruby") do %>
-ruby '2.7.1'
+ruby '>= 3.0'
source 'https://rubygems.org/' do
gem 'kitchen-terraform', '~> 6.1'