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.
This commit is contained in:
Eric Anderson 2018-07-30 16:31:12 -07:00
parent f8d30afb20
commit 71e9841c80
2 changed files with 2 additions and 2 deletions

View File

@ -55,7 +55,7 @@ notifications:
cache: cache:
directories: directories:
- /tmp/protobuf-* - /tmp/protobuf-cache
- /tmp/gradle-caches-modules-2 - /tmp/gradle-caches-modules-2
- /tmp/gradle-wrapper - /tmp/gradle-wrapper

View File

@ -8,7 +8,7 @@ PROTOBUF_VERSION=3.5.1
# ARCH is 64 bit unless otherwise specified. # ARCH is 64 bit unless otherwise specified.
ARCH="${ARCH:-64}" ARCH="${ARCH:-64}"
DOWNLOAD_DIR=/tmp/source 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 mkdir -p $DOWNLOAD_DIR
# Start with a sane default # Start with a sane default