Use a tag to store the ccache blob

Author: Jason Mobarak

Makefile

@@ -8,6 +8,8 @@ SCRIPTS := .travis.sh \
 					 do_clang_build.bash \
 					 push_ccache.bash \
 					 pull_ccache.bash \
+					 most_recent_tag.bash \
+					 s3_download.bash \
 
 all: check base build
 

describe_repo.bash

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+git describe --tags --abbrev=0

most_recent_tag.bash

@@ -17,22 +17,29 @@ set -xe
 REPO="${PWD##*/}"
 BUCKET="${BUCKET:-llvm-obfuscator-arm}"
 
-BUILD_VERSION="$(./describe_repo.bash)"
+if [[ -z "$BUILD_VERSION" ]]; then
+  BUILD_VERSION="$(git describe --tags --always --dirty)"
+fi
+
 BUILD_PATH="$REPO/$BUILD_VERSION"
+
 if [[ ! -z "$PRODUCT_VERSION" ]]; then
     BUILD_PATH="$BUILD_PATH/$PRODUCT_VERSION"
 fi
+
 if [[ ! -z "$PRODUCT_REV" ]]; then
     BUILD_PATH="$BUILD_PATH/$PRODUCT_REV"
 fi
+
 if [[ ! -z "$PRODUCT_TYPE" ]]; then
     BUILD_PATH="$BUILD_PATH/$PRODUCT_TYPE"
 fi
 
 echo "Uploading $* to $BUILD_PATH"
-echo "Publish PULL_REQUEST ($TRAVIS_PULL_REQUEST)"
-echo "Publish BRANCH ($TRAVIS_BRANCH)"
-echo "Publish TAG ($TRAVIS_TAG)"
+
+[[ -n "$TRAVIS_PULL_REQUEST" ]] || echo "Publish PULL_REQUEST ($TRAVIS_PULL_REQUEST)"
+[[ -n "$TRAVIS_BRANCH" ]]       || echo "Publish BRANCH ($TRAVIS_BRANCH)"
+[[ -n "$TRAVIS_TAG" ]]          || echo "Publish TAG ($TRAVIS_TAG)"
 
 for file in "$@"; do
     KEY="$BUILD_PATH/$(basename "$file")"

publish.sh

@@ -26,9 +26,6 @@ while [[ $# -gt 0 ]]; do
   --variant=vanilla)    VARIANT="vanilla";    shift ;;
   --variant=obfuscator) VARIANT="obfuscator"; shift ;;
 
-  --verbose)            VERBOSE="-v";         shift ;;
-  --no-tty)             NO_TTY=--no-tty;      shift ;;
-
   *)                                          shift ;;
   esac
 done
@@ -43,14 +40,14 @@ if [[ -z "${VARIANT:-}" ]]; then
   exit 1
 fi
 
-BUILD_VERSION="$(./describe_repo.bash)"
-ARCH="$(echo ${ARCH} | sed 's@\\;@-@g')"
+BUILD_VERSION="$(./most_recent_tag.bash)"
+ARCH="${ARCH//\\;/-}"
 
 CCACHE_ARCHIVE="ccache-${VARIANT}-${ARCH}-${BUILD_VERSION}.tbz2"
 
-./s3_download.bash ${CCACHE_ARCHIVE}
+./s3_download.bash "${CCACHE_ARCHIVE}"
 
-docker run ${INTERACTIVE[@]:-} --rm \
+docker run --rm \
     -v "$PWD:/this_dir" \
     -v $VARIANT-llvm-ccache:/work/ccache \
     "$DOCKER_NAMETAG-$VARIANT" \

pull_ccache.bash

@@ -28,9 +28,6 @@ while [[ $# -gt 0 ]]; do
   --variant=vanilla)    VARIANT="vanilla";    shift ;;
   --variant=obfuscator) VARIANT="obfuscator"; shift ;;
 
-  --verbose)            VERBOSE="-v";         shift ;;
-  --no-tty)             NO_TTY=--no-tty;      shift ;;
-
   *)                                          shift ;;
   esac
 done
@@ -45,8 +42,8 @@ if [[ -z "${VARIANT:-}" ]]; then
   exit 1
 fi
 
-BUILD_VERSION="$(./describe_repo.bash)"
-ARCH="$(echo ${ARCH} | sed 's@\\;@-@g')"
+BUILD_VERSION="$(./most_recent_tag.bash)"
+ARCH="${ARCH//\\;/-}"
 
 CCACHE_ARCHIVE="ccache-${VARIANT}-${ARCH}-${BUILD_VERSION}.tbz2"
 
@@ -56,4 +53,4 @@ docker run -it --rm \
     "$DOCKER_NAMETAG-$VARIANT" \
     /bin/bash -c "tar -cjf /this_dir/${CCACHE_ARCHIVE} -C /work/ccache ."
 
-./publish.sh "${CCACHE_ARCHIVE}"
+BUILD_VERSION="${BUILD_VERSION}" ./publish.sh "${CCACHE_ARCHIVE}"

push_ccache.bash

@@ -18,7 +18,7 @@ set -xe
 REPO="${PWD##*/}"
 BUCKET="${BUCKET:-llvm-obfuscator-arm}"
 
-BUILD_VERSION="$(./describe_repo.bash)"
+BUILD_VERSION="$(./most_recent_tag.bash)"
 BUILD_PATH="$REPO/$BUILD_VERSION"
 if [[ ! -z "$PRODUCT_VERSION" ]]; then
     BUILD_PATH="$BUILD_PATH/$PRODUCT_VERSION"