Disable Travis cache, handle tar differences.

This commit is contained in:
Pär Winzell 2019-06-01 13:02:16 -07:00
parent 5b475476ba
commit d8dc8c6cf3
1 changed files with 8 additions and 4 deletions

View File

@ -9,17 +9,21 @@ matrix:
- APP_NAME="FBX2glTF-linux-x64" - APP_NAME="FBX2glTF-linux-x64"
- CONAN_CONFIG="-s compiler.libcxx=libstdc++11" - CONAN_CONFIG="-s compiler.libcxx=libstdc++11"
- FBXSDK_TARBALL="https://github.com/zellski/FBXSDK-Linux/archive/2019.2.tar.gz" - FBXSDK_TARBALL="https://github.com/zellski/FBXSDK-Linux/archive/2019.2.tar.gz"
- TAR_WILDCARDS="--wildcards"
- os: osx - os: osx
osx_image: xcode10.2 osx_image: xcode10.2
env: env:
- APP_NAME="FBX2glTF-darwin-x64" - APP_NAME="FBX2glTF-darwin-x64"
- CONAN_CONFIG="-s compiler=apple-clang -s compiler.version=10.0 -s compiler.libcxx=libc++" - CONAN_CONFIG="-s compiler=apple-clang -s compiler.version=10.0 -s compiler.libcxx=libc++"
- FBXSDK_TARBALL="https://github.com/zellski/FBXSDK-Darwin/archive/2019.2.tar.gz" - FBXSDK_TARBALL="https://github.com/zellski/FBXSDK-Darwin/archive/2019.2.tar.gz"
- TAR_WILDCARDS=""
compiler: gcc compiler: gcc
language: generic language: generic
cache:
directories: #disabled for now
- ${HOME}/.conan #cache:
# directories:
# - ${HOME}/.conan
addons: addons:
apt: apt:
@ -28,7 +32,7 @@ addons:
packages: zstd packages: zstd
install: install:
- curl -sL "${FBXSDK_TARBALL}" | tar xz --strip-components=1 --wildcards */sdk - curl -sL "${FBXSDK_TARBALL}" | tar xz --strip-components=1 ${TAR_WILDCARDS} */sdk
- zstd -d -r --rm sdk - zstd -d -r --rm sdk
- git clone --depth 1 git://github.com/astropy/ci-helpers.git - git clone --depth 1 git://github.com/astropy/ci-helpers.git
- source ci-helpers/travis/setup_conda.sh - source ci-helpers/travis/setup_conda.sh