Skip to content

Commit abd4215

Browse files
author
Jason Mobarak
committed
Stop fighting with travis/github
1 parent d0c3e41 commit abd4215

File tree

6 files changed

+4
-6
lines changed

6 files changed

+4
-6
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ SCRIPTS := .travis.sh \
88
do_clang_build.bash \
99
push_ccache.bash \
1010
pull_ccache.bash \
11-
most_recent_tag.bash \
1211
s3_download.bash \
1312

1413
all: check base build

build_tag

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v17

most_recent_tag.bash

Lines changed: 0 additions & 2 deletions
This file was deleted.

pull_ccache.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ -z "${VARIANT:-}" ]]; then
4040
exit 1
4141
fi
4242

43-
BUILD_VERSION="$(./most_recent_tag.bash)"
43+
BUILD_VERSION="$(cat build_tag)"
4444
ARCH="${ARCH//\\;/-}"
4545

4646
CCACHE_ARCHIVE="ccache-${VARIANT}-${ARCH}-${BUILD_VERSION}.tbz2"

push_ccache.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ if [[ -z "${VARIANT:-}" ]]; then
4242
exit 1
4343
fi
4444

45-
BUILD_VERSION="$(./most_recent_tag.bash)"
45+
BUILD_VERSION="$(cat build_tag)"
4646
ARCH="${ARCH//\\;/-}"
4747

4848
CCACHE_ARCHIVE="ccache-${VARIANT}-${ARCH}-${BUILD_VERSION}.tbz2"

s3_download.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -xe
1818
REPO="${PWD##*/}"
1919
BUCKET="${BUCKET:-llvm-obfuscator-arm}"
2020

21-
BUILD_VERSION="$(./most_recent_tag.bash)"
21+
BUILD_VERSION="$(cat build_tag)"
2222
BUILD_PATH="$REPO/$BUILD_VERSION"
2323
if [[ ! -z "$PRODUCT_VERSION" ]]; then
2424
BUILD_PATH="$BUILD_PATH/$PRODUCT_VERSION"

0 commit comments

Comments
 (0)