Skip to content

Commit 71cb2c6

Browse files
authored
Merge pull request #254 from aws/release111
Sync changes for release 1.1.1
2 parents d20ae1d + 395de4d commit 71cb2c6

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

bin/codedeploy-agent

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
$:.unshift File.join(File.dirname(File.expand_path('..', __FILE__)), 'lib')
44

5-
ruby_versions = ["2.5", "2.4", "2.3", "2.2", "2.1", "2.0"]
5+
ruby_versions = ["2.7", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"]
66
actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i}
77
left_bound = '2.0.0'.split('.').map{|s|s.to_i}
88
ruby_bin = nil

bin/install

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@ To use a HTTP proxy, specify --proxy followed by the proxy server
7878
defined by http://hostname:port
7979
8080
This install script needs Ruby version 2.x installed as a prerequisite.
81-
Currently recommanded Ruby versions are 2.0.0, 2.1.8, 2.2.4, 2.3, 2.4, and 2.5.
81+
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.
8282
If multiple Ruby versions are installed, the default ruby version will be used.
83-
If the default ruby version does not satisfy reqirement, the newest version will be used.
83+
If the default ruby version does not satisfy requirement, the newest version will be used.
8484
If you do not have a supported Ruby version installed, please install one of them first.
8585
8686
EOF
8787
end
8888

8989
def supported_ruby_versions
90-
['2.5', '2.4', '2.3', '2.2', '2.1', '2.0']
90+
['2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0']
9191
end
9292

9393
# check ruby version, only version 2.x works
@@ -173,7 +173,7 @@ EOF
173173
# change interpreter when symlink /usr/bin/ruby2.x exists, but running with non-supported ruby version
174174
actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i}
175175
left_bound = '2.0.0'.split('.').map{|s|s.to_i}
176-
right_bound = '2.5.0'.split('.').map{|s|s.to_i}
176+
right_bound = '2.7.0'.split('.').map{|s|s.to_i}
177177
if (actual_ruby_version <=> left_bound) < 0
178178
if(!@reexeced)
179179
@log.info("The current Ruby version is not 2.x! Restarting the installer with #{ruby_interpreter_path}")

bin/update

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,16 @@ If --downgrade is specified, the script will only update the agent if an older v
8989
agent is marked as current. Upgrades will be ignored.
9090
9191
This install script needs Ruby version 2.x installed as a prerequisite.
92-
Currently recommanded Ruby versions are 2.0.0, 2.1.8, 2.2.4 and 2.3.0, and 2.4.0.
92+
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.
9393
If multiple Ruby versions are installed, the default ruby version will be used.
94-
If the default ruby version does not satisfy reqirement, the newest version will be used.
94+
If the default ruby version does not satisfy requirement, the newest version will be used.
9595
If you do not have a supported Ruby version installed, please install one of them first.
9696
9797
EOF
9898
end
9999

100100
def supported_ruby_versions
101-
['2.5', '2.4', '2.3', '2.2', '2.1', '2.0']
101+
['2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0']
102102
end
103103

104104
# check ruby version, only version 2.x works
@@ -199,7 +199,7 @@ EOF
199199
# change interpreter when symlink /usr/bin/ruby2.x exists, but running with non-supported ruby version
200200
actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i}
201201
left_bound = '2.0.0'.split('.').map{|s|s.to_i}
202-
right_bound = '2.4.1'.split('.').map{|s|s.to_i}
202+
right_bound = '2.7.0'.split('.').map{|s|s.to_i}
203203
if (actual_ruby_version <=> left_bound) < 0
204204
if(!@reexeced)
205205
@log.info("The current Ruby version is not 2.x! Restarting the installer with #{ruby_interpreter_path}")

codedeploy_agent.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |spec|
22
spec.name = 'aws_codedeploy_agent'
3-
spec.version = '1.1.0'
3+
spec.version = '1.1.1'
44
spec.summary = 'Packages AWS CodeDeploy agent libraries'
55
spec.description = 'AWS CodeDeploy agent is responsible for doing the actual work of deploying software on an individual EC2 instance'
66
spec.author = 'Amazon Web Services'

0 commit comments

Comments
 (0)