From b405ad8ed489232ea6051d44695a57156eb2a5cc Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 Aug 2019 10:52:38 +0000
Subject: Update Xcode or Homebrew (apply
 https://github.com/nobu/ruby/commit/c86b74dc431d4cbdeb7d3c3fe5ac0693dc731bb1)
 [Bug #16032]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 .travis.yml | 17 ++++++++++++++---
 version.h   |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 532d7f16b6..f860bb79b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,6 @@ language: c
 
 dist: xenial
 
-osx_image: xcode10.1
-
 git:
   quiet: true
 
@@ -47,6 +45,7 @@ addons:
       - valgrind
       - zlib1g-dev
   homebrew:
+    update: true
     packages:
       - gdbm
       - gmp
@@ -237,6 +236,17 @@ env:
 
   - &x86_64-darwin17
     name: x86_64-darwin17
+    osx_image: xcode10.1
+    <<: *osx
+    env:
+      - CONFIG_FLAG=--with-opt-dir=/usr/local/opt/openssl@1.1:/usr/local/opt/zlib
+      - TEST_ALL_OPTS="--tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx"
+      # Disabling -j3 because it seems to cause a hang on building Ruby: https://travis-ci.org/ruby/ruby/jobs/471021727
+      - JOBS=
+
+  - &x86_64-darwin18
+    name: x86_64-darwin18
+    osx_image: xcode11
     <<: *osx
     env:
       - CONFIG_FLAG=--with-opt-dir=/usr/local/opt/openssl@1.1:/usr/local/opt/zlib
@@ -246,6 +256,7 @@ env:
 
   - &universal-darwin17
     name: uinversal.x86_64h-darwin17
+    osx_image: xcode10.1
     <<: *osx
     <<: *cron-only
     <<: *make-test-only
@@ -256,7 +267,7 @@ env:
 matrix:
   include:
     # to reduce time for finishing all jobs, run the slowest osx build first.
-    - <<: *x86_64-darwin17
+    - <<: *x86_64-darwin18
     - <<: *x86_64-linux
     - <<: *i686-linux
     - <<: *jemalloc
diff --git a/version.h b/version.h
index 462aa01637..f1574c0d05 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.6.3"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 80
+#define RUBY_PATCHLEVEL 81
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 7
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3