From 64a4539612098be6fc139258f95100ce428eda7a Mon Sep 17 00:00:00 2001
From: Damian Szymanski <damian@assembla.com>
Date: Tue, 18 Feb 2020 08:19:02 +0100
Subject: [PATCH 1/2] Xenial updates

---
 .../travis_ci_opal/attributes/default.rb      | 11 +++++---
 .../travis_ci_sardonyx/attributes/default.rb  | 27 ++++++++++++-------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/cookbooks/travis_ci_opal/attributes/default.rb b/cookbooks/travis_ci_opal/attributes/default.rb
index 0b297ca3e..24a1d16cd 100644
--- a/cookbooks/travis_ci_opal/attributes/default.rb
+++ b/cookbooks/travis_ci_opal/attributes/default.rb
@@ -66,18 +66,23 @@
 
 override['travis_build_environment']['nodejs_versions'] = %w[
   11.0.0
-  8.12.0
+  8.16.0
 ]
-override['travis_build_environment']['nodejs_default'] = '8.12.0'
+override['travis_build_environment']['nodejs_default'] = '8.16.0'
 
 override['travis_build_environment']['pythons'] = []
 
 rubies = %w[
+  2.3.8
   2.4.5
+  2.4.9
+  2.5.7
+  2.7.0
+  2.6.5
   2.5.3
 ]
 
-override['travis_build_environment']['default_ruby'] = rubies.reject { |n| n =~ /jruby/ }.max
+override['travis_build_environment']['default_ruby'] = rubies.reject { |n| n =~ /jruby/ }.last
 override['travis_build_environment']['rubies'] = rubies
 
 override['travis_build_environment']['otp_releases'] = %w[
diff --git a/cookbooks/travis_ci_sardonyx/attributes/default.rb b/cookbooks/travis_ci_sardonyx/attributes/default.rb
index 778d2a57d..7034a73d8 100644
--- a/cookbooks/travis_ci_sardonyx/attributes/default.rb
+++ b/cookbooks/travis_ci_sardonyx/attributes/default.rb
@@ -15,8 +15,10 @@
 
 php_aliases = {
   '5.6' => '5.6.40',
-  '7.1' => '7.1.27',
-  '7.2' => '7.2.15'
+  '7.1' => '7.1.33',
+  '7.2' => '7.2.27',
+  '7.3' => '7.3.14',
+  '7.4' => '7.4.2'
 }
 override['travis_build_environment']['php_versions'] = php_aliases.values
 override['travis_build_environment']['php_default_version'] = php_aliases['7.2']
@@ -57,15 +59,18 @@
 override['leiningen']['user'] = 'travis'
 
 override['travis_build_environment']['nodejs_versions'] = %w[
-  11.0.0
-  8.12.0
+  13.3.0
+  12.13.1
+  11.15.0
+  8.16.0
 ]
-override['travis_build_environment']['nodejs_default'] = '8.12.0'
+override['travis_build_environment']['nodejs_default'] = '8.16.0'
 
 pythons = %w[
-  2.7.15
-  3.6.7
-  3.7.1
+  2.7.17
+  3.6.10
+  3.7.6
+  3.8.1
 ]
 
 # Reorder pythons so that default python2 and python3 come first
@@ -92,10 +97,14 @@ def python_aliases(full_name)
 rubies = %w[
   2.3.8
   2.4.5
+  2.4.9
+  2.5.7
+  2.7.0
+  2.6.5
   2.5.3
 ]
 
-override['travis_build_environment']['default_ruby'] = rubies.reject { |n| n =~ /jruby/ }.max
+override['travis_build_environment']['default_ruby'] = rubies.reject { |n| n =~ /jruby/ }.last
 override['travis_build_environment']['rubies'] = rubies
 
 override['travis_build_environment']['otp_releases'] = []

From ed2d6fb20ea6efc0f7e3547deea01a52b1b9a088 Mon Sep 17 00:00:00 2001
From: Damian Szymanski <damian@assembla.com>
Date: Tue, 18 Feb 2020 11:17:49 +0100
Subject: [PATCH 2/2] Increase disk size

---
 ci-sardonyx.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-sardonyx.yml b/ci-sardonyx.yml
index ef43a6719..dbac17516 100644
--- a/ci-sardonyx.yml
+++ b/ci-sardonyx.yml
@@ -29,7 +29,7 @@ builders:
   zone: us-central1-a
   image_name: "{{ user `image_name` }}"
   machine_type: n1-standard-4
-  disk_size: 15
+  disk_size: 40
   tags:
   - ci
   - sardonyx