From c62690ccc4206525cbd223040909d2b3dc5158d4 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 26 Jun 2019 20:06:40 +0200
Subject: [PATCH] ci: Travis: upgrade OSX images (10.1 => 10.2) (#10319)

* ci: Travis: upgrade OSX images (10.1 => 10.2)

* ci: nvim-deps: use `cp -a`  [skip appveyor]

Symlinks should be preserved.

Ref: https://github.com/neovim/neovim/pull/10319#issuecomment-505410132
---
 .travis.yml        | 4 ++--
 ci/common/build.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08f5306755..c7c824afc0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,10 +75,10 @@ jobs:
     - stage: second stage
       os: osx
       compiler: clang
-      osx_image: xcode10.1  # macOS 10.13
+      osx_image: xcode10.2  # macOS 10.14
     - os: osx
       compiler: gcc
-      osx_image: xcode10.1  # macOS 10.13
+      osx_image: xcode10.2  # macOS 10.14
 
     - os: linux
       compiler: gcc
diff --git a/ci/common/build.sh b/ci/common/build.sh
index 7c27d61586..85b141de86 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -34,8 +34,8 @@ build_deps() {
     export CCACHE_RECACHE=1
   elif test -f "${CACHE_MARKER}" ; then
     echo "Using third-party dependencies from Travis cache (last update: $(_stat "${CACHE_MARKER}"))."
-    cp -r "${HOME}/.cache/nvim-deps"/. "${DEPS_BUILD_DIR}"
-    cp -r "${HOME}/.cache/nvim-deps-downloads"/. "${DEPS_DOWNLOAD_DIR}"
+    cp -a "${HOME}/.cache/nvim-deps"/. "${DEPS_BUILD_DIR}"
+    cp -a "${HOME}/.cache/nvim-deps-downloads"/. "${DEPS_DOWNLOAD_DIR}"
   fi
 
   # Even if we're using cached dependencies, run CMake and make to