Stop fighting with travis/github

swift-nav · Jun 12, 2018 · abd4215 · abd4215
1 parent d0c3e41
commit abd4215
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,6 @@ SCRIPTS := .travis.sh \
 					 do_clang_build.bash \
 					 push_ccache.bash \
 					 pull_ccache.bash \
-					 most_recent_tag.bash \
 					 s3_download.bash \
 
 all: check base build

diff --git a/build_tag b/build_tag
@@ -0,0 +1 @@
+v17
diff --git a/most_recent_tag.bash b/most_recent_tag.bash
diff --git a/pull_ccache.bash b/pull_ccache.bash
@@ -40,7 +40,7 @@ if [[ -z "${VARIANT:-}" ]]; then
   exit 1
 fi
 
-BUILD_VERSION="$(./most_recent_tag.bash)"
+BUILD_VERSION="$(cat build_tag)"
 ARCH="${ARCH//\\;/-}"
 
 CCACHE_ARCHIVE="ccache-${VARIANT}-${ARCH}-${BUILD_VERSION}.tbz2"

diff --git a/push_ccache.bash b/push_ccache.bash
@@ -42,7 +42,7 @@ if [[ -z "${VARIANT:-}" ]]; then
   exit 1
 fi
 
-BUILD_VERSION="$(./most_recent_tag.bash)"
+BUILD_VERSION="$(cat build_tag)"
 ARCH="${ARCH//\\;/-}"
 
 CCACHE_ARCHIVE="ccache-${VARIANT}-${ARCH}-${BUILD_VERSION}.tbz2"

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