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
This commit is contained in:
parent
ac013d7147
commit
c62690ccc4
|
@ -75,10 +75,10 @@ jobs:
|
||||||
- stage: second stage
|
- stage: second stage
|
||||||
os: osx
|
os: osx
|
||||||
compiler: clang
|
compiler: clang
|
||||||
osx_image: xcode10.1 # macOS 10.13
|
osx_image: xcode10.2 # macOS 10.14
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
osx_image: xcode10.1 # macOS 10.13
|
osx_image: xcode10.2 # macOS 10.14
|
||||||
|
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
|
|
|
@ -34,8 +34,8 @@ build_deps() {
|
||||||
export CCACHE_RECACHE=1
|
export CCACHE_RECACHE=1
|
||||||
elif test -f "${CACHE_MARKER}" ; then
|
elif test -f "${CACHE_MARKER}" ; then
|
||||||
echo "Using third-party dependencies from Travis cache (last update: $(_stat "${CACHE_MARKER}"))."
|
echo "Using third-party dependencies from Travis cache (last update: $(_stat "${CACHE_MARKER}"))."
|
||||||
cp -r "${HOME}/.cache/nvim-deps"/. "${DEPS_BUILD_DIR}"
|
cp -a "${HOME}/.cache/nvim-deps"/. "${DEPS_BUILD_DIR}"
|
||||||
cp -r "${HOME}/.cache/nvim-deps-downloads"/. "${DEPS_DOWNLOAD_DIR}"
|
cp -a "${HOME}/.cache/nvim-deps-downloads"/. "${DEPS_DOWNLOAD_DIR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Even if we're using cached dependencies, run CMake and make to
|
# Even if we're using cached dependencies, run CMake and make to
|
||||||
|
|
Loading…
Reference in New Issue