diff --git a/.travis.yml b/.travis.yml index 6fe1b3aa..2efab7a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,10 @@ script: - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" - ant debug -Dtest.version=1 - cp bin/xashdroid-debug.apk xashdroid-armv7.apk + - ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean + - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" CFLAGS_OPT_ARM="-mthumb -mfpu=neon-vfpv4 -mcpu=cortex-a15 -ffast-math -pipe -fPIC" + - ant debug -Dtest.version=1 + - cp bin/xashdroid-debug.apk xashdroid-armv7-cortex-a7-a15.apk - ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi" - ant debug -Dtest.version=1 - cp bin/xashdroid-debug.apk xashdroid-armv6.apk diff --git a/travis-upload.sh b/travis-upload.sh index 990e2d2e..223b8a98 100644 --- a/travis-upload.sh +++ b/travis-upload.sh @@ -22,7 +22,7 @@ FILE_EXT="${FNAME##*.}" OUTNAME=$PREFIX-$FILE_BASE-$POSTFIX.$FILE_EXT echo $FNAME: `curl --upload-file $FNAME https://transfer.sh/$OUTNAME` curl -T $FNAME -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$OUTNAME > /dev/null -curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/current-$FILE_BASE-$TRAVIS_BRANCH.$FILE_EXT > /dev/null +curl -T $FNAME.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/current-$FILE_BASE-$TRAVIS_BRANCH.$FILE_EXT > /dev/null shift done exit 0