From 71e9841c80bcc069ee2f34e6f846c722e5adac0f Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Mon, 30 Jul 2018 16:31:12 -0700
Subject: [PATCH] travis.yml: Fix protobuf compilation caching

Wildcard apparently doesn't work... silently. Move versions into their
own directory so we can use a hard-coded string in the travis
configuration.
---
 .travis.yml                       | 2 +-
 buildscripts/make_dependencies.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 04cbe928ac..6ee1ddd815 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ notifications:
 
 cache:
   directories:
-    - /tmp/protobuf-*
+    - /tmp/protobuf-cache
     - /tmp/gradle-caches-modules-2
     - /tmp/gradle-wrapper
 
diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh
index d45600d62d..e4aa541a5e 100755
--- a/buildscripts/make_dependencies.sh
+++ b/buildscripts/make_dependencies.sh
@@ -8,7 +8,7 @@ PROTOBUF_VERSION=3.5.1
 # ARCH is 64 bit unless otherwise specified.
 ARCH="${ARCH:-64}"
 DOWNLOAD_DIR=/tmp/source
-INSTALL_DIR="/tmp/protobuf-$PROTOBUF_VERSION/$(uname -s)-$(uname -p)-x86_$ARCH"
+INSTALL_DIR="/tmp/protobuf-cache/$PROTOBUF_VERSION/$(uname -s)-$(uname -p)-x86_$ARCH"
 mkdir -p $DOWNLOAD_DIR
 
 # Start with a sane default