summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar James Rowe2017-02-25 14:02:46 -0700
committerGravatar James Rowe2017-02-25 14:02:46 -0700
commitbf325d3859bb5f63092e18b122e38842b6ace6c7 (patch)
tree007e809e66bbd3833aa5e263e515e8071697fecc
parentMerge pull request #2569 from wwylele/wrap-unwrap (diff)
downloadyuzu-bf325d3859bb5f63092e18b122e38842b6ace6c7.tar.gz
yuzu-bf325d3859bb5f63092e18b122e38842b6ace6c7.tar.xz
yuzu-bf325d3859bb5f63092e18b122e38842b6ace6c7.zip
Change travis tar command to specify compression format
macOS uses bsdtar which doesn't have the -a flag which determines compression based on file extension.
-rwxr-xr-x.travis-upload.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis-upload.sh b/.travis-upload.sh
index 262259678..2cc968298 100755
--- a/.travis-upload.sh
+++ b/.travis-upload.sh
@@ -6,6 +6,7 @@ if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then
6 if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then 6 if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
7 REV_NAME="citra-linux-${GITDATE}-${GITREV}" 7 REV_NAME="citra-linux-${GITDATE}-${GITREV}"
8 ARCHIVE_NAME="${REV_NAME}.tar.xz" 8 ARCHIVE_NAME="${REV_NAME}.tar.xz"
9 COMPRESSION_FLAGS="-cJvf"
9 mkdir "$REV_NAME" 10 mkdir "$REV_NAME"
10 11
11 cp build/src/citra/citra "$REV_NAME" 12 cp build/src/citra/citra "$REV_NAME"
@@ -13,6 +14,7 @@ if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then
13 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then 14 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
14 REV_NAME="citra-osx-${GITDATE}-${GITREV}" 15 REV_NAME="citra-osx-${GITDATE}-${GITREV}"
15 ARCHIVE_NAME="${REV_NAME}.tar.gz" 16 ARCHIVE_NAME="${REV_NAME}.tar.gz"
17 COMPRESSION_FLAGS="-czvf"
16 mkdir "$REV_NAME" 18 mkdir "$REV_NAME"
17 19
18 cp build/src/citra/Release/citra "$REV_NAME" 20 cp build/src/citra/Release/citra "$REV_NAME"
@@ -120,7 +122,7 @@ EOL
120 cp license.txt "$REV_NAME" 122 cp license.txt "$REV_NAME"
121 cp README.md "$REV_NAME" 123 cp README.md "$REV_NAME"
122 124
123 tar -cavf "$ARCHIVE_NAME" "$REV_NAME" 125 tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME"
124 126
125 # move the compiled archive into the artifacts directory to be uploaded by travis releases 127 # move the compiled archive into the artifacts directory to be uploaded by travis releases
126 mv "$ARCHIVE_NAME" artifacts/ 128 mv "$ARCHIVE_NAME" artifacts/