Merge branch 'TravisExperiments' of https://github.com/LemADEC/WarpDrive into TravisExperiments

Conflicts:
	.travis.yml
This commit is contained in:
Francesco Macagno 2015-08-25 21:00:43 -07:00
commit f60f6dda94

View file

@ -24,4 +24,4 @@ deploy:
jdk: oraclejdk7
after_success:
- export RELEASE_FILE=$(ls build/libs/*.jar)
- curl "--ftp-create-dirs -T ${RELEASE_FILE} --user $FTP_USER:$FTP_PASSWORD ftp://khazaddum.caltech.edu/warpdrive/files/${RELEASE_FILE}.${TRAVIS_BUILD_NUMBER}-${TRAVIS_BRANCH}.jar"
- curl "--ftp-create-dirs -T ${RELEASE_FILE} --user $FTP_USER:$FTP_PASSWORD ftp://khazaddum.caltech.edu/warpdrive/files/${RELEASE_FILE}.${TRAVIS_BUILD_NUMBER}-${TRAVIS_BRANCH}.jar"