From d8dc8c6cf349ac754f6cc5554074afd6b96269cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A4r=20Winzell?= <par.winzell@alyx.com>
Date: Sat, 1 Jun 2019 13:02:16 -0700
Subject: [PATCH] Disable Travis cache, handle tar differences.

---
 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 412ecc6..22006d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,17 +9,21 @@ matrix:
         - APP_NAME="FBX2glTF-linux-x64"
         - CONAN_CONFIG="-s compiler.libcxx=libstdc++11"
         - FBXSDK_TARBALL="https://github.com/zellski/FBXSDK-Linux/archive/2019.2.tar.gz"
+        - TAR_WILDCARDS="--wildcards"
     - os: osx
       osx_image: xcode10.2
       env:
         - APP_NAME="FBX2glTF-darwin-x64"
         - 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"
+        - TAR_WILDCARDS=""
 compiler: gcc
 language: generic
-cache:
-  directories:
-  - ${HOME}/.conan
+
+#disabled for now
+#cache:
+#  directories:
+#  - ${HOME}/.conan
 
 addons:
   apt:
@@ -28,7 +32,7 @@ addons:
     packages: zstd
 
 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
 - git clone --depth 1 git://github.com/astropy/ci-helpers.git
 - source ci-helpers/travis/setup_conda.sh