vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unneeded SUPPORT_WEBP=false from travis.yml, as we don't use SDL and SDL_image. Update travis-deploy.sh from engine repo

Browse source
This commit is contained in:
Alibek Omarov 2018-01-29 01:58:52 +03:00
parent b923b3d6b6
commit d7389e4511
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -29,17 +29,17 @@ script:
- sh gen-version.sh travis build - sh gen-version.sh travis build
- sh gen-config.sh test - sh gen-config.sh test
- python2 makepak.py xash-extras assets/extras.pak - python2 makepak.py xash-extras assets/extras.pak
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard"
- ant debug -Dtest.version=1 - ant debug -Dtest.version=1
- cp bin/xashdroid-debug.apk xashdroid-armv7.apk - cp bin/xashdroid-debug.apk xashdroid-armv7.apk
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean - 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 -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -fPIC -DHAVE_EFFICIENT_UNALIGNED_ACCESS" - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" CFLAGS_OPT_ARM="-mthumb -mfpu=neon-vfpv4 -mcpu=cortex-a15 -ffast-math -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -fPIC -DHAVE_EFFICIENT_UNALIGNED_ACCESS"
- ant debug -Dtest.version=1 - ant debug -Dtest.version=1
- cp bin/xashdroid-debug.apk xashdroid-armv7-cortex-a7-a15.apk - 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" - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="armeabi"
- ant debug -Dtest.version=1 - ant debug -Dtest.version=1
- cp bin/xashdroid-debug.apk xashdroid-armv6.apk - cp bin/xashdroid-debug.apk xashdroid-armv6.apk
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86" - ndk-build NDK_TOOLCHAIN_VERSION=4.8 -j2 APP_CFLAGS="-w" APP_ABI="x86"
- ant debug -Dtest.version=1 - ant debug -Dtest.version=1
- cp bin/xashdroid-debug.apk xashdroid-x86.apk - cp bin/xashdroid-debug.apk xashdroid-x86.apk
- ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean - ndk-build NDK_TOOLCHAIN_VERSION=4.8 clean
@ -51,7 +51,6 @@ script:
- ant debug -Dtest.version=1 - ant debug -Dtest.version=1
- cp bin/xashdroid-debug.apk xashdroid-armv5.apk - cp bin/xashdroid-debug.apk xashdroid-armv5.apk
after_script: after_script:
- sh travis-upload.sh *.apk - sh travis-upload.sh *.apk
- sh travis-deploy.sh android-optimized *.apk - sh travis-deploy.sh android-optimized *.apk

20
travis-deploy.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
echo "Travis should not deploy from pull requests" echo "Travis should not deploy from pull requests"
exit 0 exit 0
@ -11,20 +11,18 @@ else
git init git init
git config user.name FWGS-deployer git config user.name FWGS-deployer
git config user.email FWGS-deployer@users.noreply.github.com git config user.email FWGS-deployer@users.noreply.github.com
git config credential.helper "store --file=.git/credentials" git remote add travis-deploy-public https://FWGS-deployer:${GH_TOKEN}@github.com/FWGS/xash3d-deploy.git
git config credential.https://github.com.com.username FWGS-deployer
echo "https://FWGS-deployer:${GH_TOKEN}@github.com" > .git/credentials
git remote add travis-deploy-public https://github.com/FWGS/xash3d-deploy.git
echo \# $TRAVIS_BRANCH branch autobuilds from $SOURCE_NAME >> README.md echo \# $TRAVIS_BRANCH branch autobuilds from $SOURCE_NAME >> README.md
echo >> README.md echo >> README.md
echo Short changelog: >> README.md echo Short changelog: >> README.md
echo \`\`\` >> README.md echo \`\`\` >> README.md
(cd ..;git log --pretty=format:'%h %ad %s' --date iso -n 10 HEAD `curl https://raw.githubusercontent.com/FWGS/xash3d-deploy/$SOURCE_NAME-$TRAVIS_BRANCH/commit.txt`.. )| cut -d ' ' -f 1-3,5-100 >> README.md (cd $TRAVIS_BUILD_DIR;git log --pretty=format:'%h %ad %s' --date iso -n 10 HEAD `curl https://raw.githubusercontent.com/FWGS/xash3d-deploy/$SOURCE_NAME-$TRAVIS_BRANCH/commit.txt`
.. )| cut -d ' ' -f 1-3,5-100 >> README.md
echo \`\`\` >> README.md echo \`\`\` >> README.md
echo >> README.md echo >> README.md
echo [code on github]\(https://github.com/FWGS/xash3d-android-project/tree/$TRAVIS_COMMIT\) >> README.md echo [Code on GitHub]\(https://github.com/FWGS/xash3d/tree/$TRAVIS_COMMIT\) >> README.md
echo >> README.md echo >> README.md
echo [full changelog for this build]\(https://github.com/FWGS/xash3d-android-project/commits/$TRAVIS_COMMIT\) >> README.md echo [Full changelog for this build]\(https://github.com/FWGS/xash3d/commits/$TRAVIS_COMMIT\) >> README.md
echo >> README.md echo >> README.md
for arg in $*; do for arg in $*; do
echo \* [$arg]\(https://github.com/FWGS/xash3d-deploy/blob/$SOURCE_NAME-$TRAVIS_BRANCH/$arg\?raw\=true\) >> README.md echo \* [$arg]\(https://github.com/FWGS/xash3d-deploy/blob/$SOURCE_NAME-$TRAVIS_BRANCH/$arg\?raw\=true\) >> README.md
@ -32,10 +30,10 @@ else
done done
echo $TRAVIS_COMMIT > commit.txt echo $TRAVIS_COMMIT > commit.txt
git add . git add .
git commit -m "Laterst travis deploy $TRAVIS_COMMIT" git commit -m "Latest travis deploy $TRAVIS_COMMIT"
git checkout -b $SOURCE_NAME-$TRAVIS_BRANCH git checkout -b $SOURCE_NAME-$TRAVIS_BRANCH
git push -q --force travis-deploy-public $SOURCE_NAME-$TRAVIS_BRANCH git push -q --force travis-deploy-public $SOURCE_NAME-$TRAVIS_BRANCH >/dev/null 2>/dev/null
git checkout -b $SOURCE_NAME-latest git checkout -b $SOURCE_NAME-latest
git push -q --force travis-deploy-public $SOURCE_NAME-latest git push -q --force travis-deploy-public $SOURCE_NAME-latest >/dev/null 2>/dev/null
fi fi
exit 0 exit 0