summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-11-25 02:30:28 +0100
committerGitHub <noreply@github.com>2016-11-25 02:30:28 +0100
commit8a73eb802467ffeb252823ee78e4c07c91f77b37 (patch)
tree56be87c66e8174689417d58f2672c03a549099dd
parentMerge pull request #2208 from freiro/libsdl205 (diff)
parentTravis: Remove build uploading (diff)
downloadyuzu-8a73eb802467ffeb252823ee78e4c07c91f77b37.tar
yuzu-8a73eb802467ffeb252823ee78e4c07c91f77b37.tar.gz
yuzu-8a73eb802467ffeb252823ee78e4c07c91f77b37.tar.bz2
yuzu-8a73eb802467ffeb252823ee78e4c07c91f77b37.tar.lz
yuzu-8a73eb802467ffeb252823ee78e4c07c91f77b37.tar.xz
yuzu-8a73eb802467ffeb252823ee78e4c07c91f77b37.tar.zst
yuzu-8a73eb802467ffeb252823ee78e4c07c91f77b37.zip
-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
UPLOAD_DIR="/citra/nightly/osx-amd64"
mkdir "$REV_NAME"
- brew install lftp
cp build/src/citra/Release/citra "$REV_NAME"
cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME"
@@ -122,5 +121,4 @@ EOL
ARCHIVE_NAME="${REV_NAME}.tar.xz"
tar -cJvf "$ARCHIVE_NAME" "$REV_NAME"
- lftp -c "open -u citra-builds,$BUILD_PASSWORD sftp://builds.citra-emu.org; set sftp:auto-confirm yes; put -O '$UPLOAD_DIR' '$ARCHIVE_NAME'"
fi
diff --git a/.travis.yml b/.travis.yml
index ea99be2c4..a9e7aadd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,6 @@ addons:
- libqt5opengl5-dev
- xorg-dev
- lib32stdc++6 # For CMake
- - lftp # To upload builds
- clang-format-4.0
cache: