From c4de706ace1859224b4c90a6ddb5d963f5be057a Mon Sep 17 00:00:00 2001 From: James Rowe Date: Thu, 23 Feb 2017 10:01:50 -0700 Subject: [PATCH 1/2] Use gzip instead of lzma on macOS and linux releases A common report from macOS users is they can't figure out how to unzip the program. This will allow them to double click to unzip the archive which is what users on macOS expect. --- .travis-upload.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis-upload.sh b/.travis-upload.sh index 9aed815d4..bab169527 100755 --- a/.travis-upload.sh +++ b/.travis-upload.sh @@ -118,8 +118,8 @@ EOL cp license.txt "$REV_NAME" cp README.md "$REV_NAME" - ARCHIVE_NAME="${REV_NAME}.tar.xz" - tar -cJvf "$ARCHIVE_NAME" "$REV_NAME" + ARCHIVE_NAME="${REV_NAME}.tar.gz" + tar -czvf "$ARCHIVE_NAME" "$REV_NAME" # move the compiled archive into the artifacts directory to be uploaded by travis releases mv "$ARCHIVE_NAME" artifacts/ From df8c01604e87c0af007087ce01f8962e7245dc84 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Thu, 23 Feb 2017 14:05:47 -0700 Subject: [PATCH 2/2] Revert use gzip for linux Uses tar -a flag to determine compression algorithm based off file extension (so linux will continue to use xz and macOS can use gzip) --- .travis-upload.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis-upload.sh b/.travis-upload.sh index bab169527..262259678 100755 --- a/.travis-upload.sh +++ b/.travis-upload.sh @@ -5,12 +5,14 @@ if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then REV_NAME="citra-linux-${GITDATE}-${GITREV}" + ARCHIVE_NAME="${REV_NAME}.tar.xz" mkdir "$REV_NAME" cp build/src/citra/citra "$REV_NAME" cp build/src/citra_qt/citra-qt "$REV_NAME" elif [ "$TRAVIS_OS_NAME" = "osx" ]; then REV_NAME="citra-osx-${GITDATE}-${GITREV}" + ARCHIVE_NAME="${REV_NAME}.tar.gz" mkdir "$REV_NAME" cp build/src/citra/Release/citra "$REV_NAME" @@ -118,8 +120,7 @@ EOL cp license.txt "$REV_NAME" cp README.md "$REV_NAME" - ARCHIVE_NAME="${REV_NAME}.tar.gz" - tar -czvf "$ARCHIVE_NAME" "$REV_NAME" + tar -cavf "$ARCHIVE_NAME" "$REV_NAME" # move the compiled archive into the artifacts directory to be uploaded by travis releases mv "$ARCHIVE_NAME" artifacts/