From a93f0207b05c5fb731b05fcead42df753bdd4ea8 Mon Sep 17 00:00:00 2001 From: Anandaraju Coimbatore Sivaraju Date: Tue, 23 Jun 2020 17:15:04 -0700 Subject: [PATCH 1/2] Support ruby 2.6 and 2.7 Ubuntu support to 18.10+ and up requires ruby 2.6 and 2.7 support cr https://code.amazon.com/reviews/CR-28216957 --- bin/codedeploy-agent | 2 +- bin/install | 8 ++++---- bin/update | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/codedeploy-agent b/bin/codedeploy-agent index 00ef95f2..6e7d4a4b 100755 --- a/bin/codedeploy-agent +++ b/bin/codedeploy-agent @@ -2,7 +2,7 @@ $:.unshift File.join(File.dirname(File.expand_path('..', __FILE__)), 'lib') -ruby_versions = ["2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] +ruby_versions = ["2.7", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i} left_bound = '2.0.0'.split('.').map{|s|s.to_i} ruby_bin = nil diff --git a/bin/install b/bin/install index 43480a2c..948e8a70 100755 --- a/bin/install +++ b/bin/install @@ -78,16 +78,16 @@ To use a HTTP proxy, specify --proxy followed by the proxy server defined by http://hostname:port This install script needs Ruby version 2.x installed as a prerequisite. -Currently recommanded Ruby versions are 2.0.0, 2.1.8, 2.2.4, 2.3, 2.4, and 2.5. +Currently recommended Ruby versions are 2.0.0, 2.1.8, 2.2.4, 2.3, 2.4, 2.5, 2.6 and 2.7. If multiple Ruby versions are installed, the default ruby version will be used. -If the default ruby version does not satisfy reqirement, the newest version will be used. +If the default ruby version does not satisfy requirement, the newest version will be used. If you do not have a supported Ruby version installed, please install one of them first. EOF end def supported_ruby_versions - ['2.5', '2.4', '2.3', '2.2', '2.1', '2.0'] + ['2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0'] end # check ruby version, only version 2.x works @@ -173,7 +173,7 @@ EOF # change interpreter when symlink /usr/bin/ruby2.x exists, but running with non-supported ruby version actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i} left_bound = '2.0.0'.split('.').map{|s|s.to_i} - right_bound = '2.5.0'.split('.').map{|s|s.to_i} + right_bound = '2.7.0'.split('.').map{|s|s.to_i} if (actual_ruby_version <=> left_bound) < 0 if(!@reexeced) @log.info("The current Ruby version is not 2.x! Restarting the installer with #{ruby_interpreter_path}") diff --git a/bin/update b/bin/update index dbb5ba43..33985bd2 100755 --- a/bin/update +++ b/bin/update @@ -89,16 +89,16 @@ If --downgrade is specified, the script will only update the agent if an older v agent is marked as current. Upgrades will be ignored. This install script needs Ruby version 2.x installed as a prerequisite. -Currently recommanded Ruby versions are 2.0.0, 2.1.8, 2.2.4 and 2.3.0, and 2.4.0. +Currently recommended Ruby versions are 2.0.0, 2.1.8, 2.2.4, 2.3, 2.4, 2.5, 2.6 and 2.7. If multiple Ruby versions are installed, the default ruby version will be used. -If the default ruby version does not satisfy reqirement, the newest version will be used. +If the default ruby version does not satisfy requirement, the newest version will be used. If you do not have a supported Ruby version installed, please install one of them first. EOF end def supported_ruby_versions - ['2.5', '2.4', '2.3', '2.2', '2.1', '2.0'] + ['2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0'] end # check ruby version, only version 2.x works @@ -199,7 +199,7 @@ EOF # change interpreter when symlink /usr/bin/ruby2.x exists, but running with non-supported ruby version actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i} left_bound = '2.0.0'.split('.').map{|s|s.to_i} - right_bound = '2.4.1'.split('.').map{|s|s.to_i} + right_bound = '2.7.0'.split('.').map{|s|s.to_i} if (actual_ruby_version <=> left_bound) < 0 if(!@reexeced) @log.info("The current Ruby version is not 2.x! Restarting the installer with #{ruby_interpreter_path}") From 395de4d4b0ee1a80b623dd23ec8cf27e0bb64b31 Mon Sep 17 00:00:00 2001 From: Vakul Bhatia Date: Thu, 25 Jun 2020 16:27:42 -0700 Subject: [PATCH 2/2] Version changes for 1.1.1 release cr https://code.amazon.com/reviews/CR-28372133 --- codedeploy_agent.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codedeploy_agent.gemspec b/codedeploy_agent.gemspec index dd115b2f..0cd70d36 100644 --- a/codedeploy_agent.gemspec +++ b/codedeploy_agent.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |spec| spec.name = 'aws_codedeploy_agent' - spec.version = '1.1.0' + spec.version = '1.1.1' spec.summary = 'Packages AWS CodeDeploy agent libraries' spec.description = 'AWS CodeDeploy agent is responsible for doing the actual work of deploying software on an individual EC2 instance' spec.author = 'Amazon Web Services'