summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-x.travis-upload.sh2
-rw-r--r--.travis.yml1
2 files changed, 0 insertions, 3 deletions
diff --git a/.travis-upload.sh b/.travis-upload.sh
index 1bec74b3d..2eeda4c50 100755
--- a/.travis-upload.sh
+++ b/.travis-upload.sh
@@ -14,7 +14,6 @@ if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then
14 UPLOAD_DIR="/citra/nightly/osx-amd64" 14 UPLOAD_DIR="/citra/nightly/osx-amd64"
15 mkdir "$REV_NAME" 15 mkdir "$REV_NAME"
16 16
17 brew install lftp
18 cp build/src/citra/Release/citra "$REV_NAME" 17 cp build/src/citra/Release/citra "$REV_NAME"
19 cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME" 18 cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME"
20 19
@@ -122,5 +121,4 @@ EOL
122 121
123 ARCHIVE_NAME="${REV_NAME}.tar.xz" 122 ARCHIVE_NAME="${REV_NAME}.tar.xz"
124 tar -cJvf "$ARCHIVE_NAME" "$REV_NAME" 123 tar -cJvf "$ARCHIVE_NAME" "$REV_NAME"
125 lftp -c "open -u citra-builds,$BUILD_PASSWORD sftp://builds.citra-emu.org; set sftp:auto-confirm yes; put -O '$UPLOAD_DIR' '$ARCHIVE_NAME'"
126fi 124fi
diff --git a/.travis.yml b/.travis.yml
index ea99be2c4..a9e7aadd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,6 @@ addons:
25 - libqt5opengl5-dev 25 - libqt5opengl5-dev
26 - xorg-dev 26 - xorg-dev
27 - lib32stdc++6 # For CMake 27 - lib32stdc++6 # For CMake
28 - lftp # To upload builds
29 - clang-format-4.0 28 - clang-format-4.0
30 29
31cache: 30cache: