kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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:
Daniel Hahler 2019-06-26 20:06:40 +02:00 committed by GitHub
parent ac013d7147
commit c62690ccc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -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

4
ci/common/build.sh
View File

@ -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