diff options
| author | James Rowe <jroweboy@gmail.com> | 2016-11-19 21:11:49 +0100 |
|---|---|---|
| committer | James Rowe <jroweboy@gmail.com> | 2016-12-31 19:54:51 +0100 |
| commit | b03e7bf28f75636a4f69176c91911687c755b483 (patch) | |
| tree | a33bdab6a5a096ea66cc8ce74d2863396f575dc2 /.travis-upload.sh | |
| parent | Merge pull request #2386 from bunnei/fix-bg-color (diff) | |
| download | yuzu-b03e7bf28f75636a4f69176c91911687c755b483.tar yuzu-b03e7bf28f75636a4f69176c91911687c755b483.tar.gz yuzu-b03e7bf28f75636a4f69176c91911687c755b483.tar.bz2 yuzu-b03e7bf28f75636a4f69176c91911687c755b483.tar.lz yuzu-b03e7bf28f75636a4f69176c91911687c755b483.tar.xz yuzu-b03e7bf28f75636a4f69176c91911687c755b483.tar.zst yuzu-b03e7bf28f75636a4f69176c91911687c755b483.zip | |
Diffstat (limited to '')
| -rwxr-xr-x | .travis-upload.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.travis-upload.sh b/.travis-upload.sh index 2eeda4c50..9aed815d4 100755 --- a/.travis-upload.sh +++ b/.travis-upload.sh @@ -1,17 +1,16 @@ if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`" GITREV="`git show -s --format='%h'`" + mkdir -p artifacts if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then - REV_NAME="citra-${GITDATE}-${GITREV}-linux-amd64" - UPLOAD_DIR="/citra/nightly/linux-amd64" + REV_NAME="citra-linux-${GITDATE}-${GITREV}" 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-${GITDATE}-${GITREV}-osx-amd64" - UPLOAD_DIR="/citra/nightly/osx-amd64" + REV_NAME="citra-osx-${GITDATE}-${GITREV}" mkdir "$REV_NAME" cp build/src/citra/Release/citra "$REV_NAME" @@ -121,4 +120,7 @@ EOL ARCHIVE_NAME="${REV_NAME}.tar.xz" tar -cJvf "$ARCHIVE_NAME" "$REV_NAME" + + # move the compiled archive into the artifacts directory to be uploaded by travis releases + mv "$ARCHIVE_NAME" artifacts/ fi |