Browse Source

travis: reorder tasks depending on their breakability. Use r10e for Android and host toolchain

pull/2/head
Alibek Omarov 5 years ago
parent
commit
ce20da28e1
  1. 119
      .travis.yml

119
.travis.yml

@ -20,6 +20,17 @@ jobs:
script: script:
- sh scripts/yadisk_clear.sh - sh scripts/yadisk_clear.sh
- stage: build - stage: build
name: "Build for Windows MSVC"
cache: ccache
os: windows
before_script:
- sh scripts/travis_common_deps.sh
- sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
script:
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
after_script:
- sh scripts/continious_upload.sh xash3d-vc.7z xash3d-vc2008-sln.7z
- # ...
name: "Build for Linux i686" name: "Build for Linux i686"
cache: ccache cache: ccache
os: linux os: linux
@ -48,32 +59,6 @@ jobs:
after_script: after_script:
- ccache --show-stats - ccache --show-stats
- sh scripts/continious_upload.sh xash3d-fwgs-${ARCH}.AppImage xashds-linux-${ARCH} - sh scripts/continious_upload.sh xash3d-fwgs-${ARCH}.AppImage xashds-linux-${ARCH}
- # ...
name: "Build for Linux amd64"
cache: ccache
os: linux
dist: xenial
addons:
apt:
packages:
- libx11-dev
- libxext-dev
- x11-utils
- libgl1-mesa-dev
- libasound-dev
- libstdc++6
- libfuse2
- unzip
before_script:
- export ARCH=x86_64
- sh scripts/travis_common_deps.sh
- sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
script:
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh full
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh dedicated
after_script:
- ccache --show-stats
- sh scripts/continious_upload.sh xash3d-fwgs-${ARCH}.AppImage xashds-linux-${ARCH}
- # ... - # ...
name: "Build for Android" name: "Build for Android"
cache: ccache cache: ccache
@ -84,11 +69,13 @@ jobs:
before_script: before_script:
- export ANDROID_HOME=$TRAVIS_BUILD_DIR/sdk - export ANDROID_HOME=$TRAVIS_BUILD_DIR/sdk
- sh scripts/travis_common_deps.sh - sh scripts/travis_common_deps.sh
- sh scripts/travis_android_deps.sh - sh scripts/travis_android_deps.sh r10e
- export ANDROID_SDK_HOME=$ANDROID_HOME - export ANDROID_SDK_HOME=$ANDROID_HOME
- export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle
script: script:
- cd android - cd android
- export ARCHS="armeabi armeabi-v7a-hard x86"
- export TOOLCHAIN="host"
- sh compile.sh release - sh compile.sh release
after_script: after_script:
- ccache --show-stats - ccache --show-stats
@ -103,79 +90,44 @@ jobs:
before_script: before_script:
- export ANDROID_HOME=$TRAVIS_BUILD_DIR/sdk - export ANDROID_HOME=$TRAVIS_BUILD_DIR/sdk
- sh scripts/travis_common_deps.sh - sh scripts/travis_common_deps.sh
- sh scripts/travis_android_deps.sh - sh scripts/travis_android_deps.sh r10e
- export ANDROID_SDK_HOME=$ANDROID_HOME - export ANDROID_SDK_HOME=$ANDROID_HOME
- export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle
script: script:
- cd android - cd android
- export ARCHS="aarch64 x86_64" - export ARCHS="aarch64 x86_64"
- export TOOLCHAIN="host"
- sh compile.sh release - sh compile.sh release
after_script: after_script:
- ccache --show-stats - ccache --show-stats
- mv xashdroid.apk xashdroid-64-test.apk - mv xashdroid.apk xashdroid-64-test.apk
- sh ../scripts/continious_upload.sh xashdroid-64-test.apk - sh ../scripts/continious_upload.sh xashdroid-64-test.apk
- # ... - # ...
name: "Build for Android arm hardfp" name: "Build for Linux amd64"
cache: ccache
os: linux
dist: xenial
language: java # we want xenial, so just java, not android
jdk: openjdk8
addons:
apt:
packages:
- clang-9
- lld-9
- p7zip-full
sources:
- sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
before_script:
- export ANDROID_HOME=$TRAVIS_BUILD_DIR/sdk
- sh scripts/travis_common_deps.sh
- sh scripts/travis_android_deps.sh r10e
- export ANDROID_SDK_HOME=$ANDROID_HOME
- export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle
script:
- cd android
- export ARCHS="armeabi-v7a-hard"
- export TOOLCHAIN="host"
- sh compile.sh release
after_script:
- ccache --show-stats
- mv xashdroid.apk xashdroid-hardfp-test.apk
- sh ../scripts/continious_upload.sh xashdroid-hardfp-test.apk
- # ...
name: "Build for Android arm softfp w/ polly"
cache: ccache cache: ccache
os: linux os: linux
dist: xenial dist: xenial
language: java # we want xenial, so just java, not android
jdk: openjdk8
addons: addons:
apt: apt:
packages: packages:
- clang-9 - libx11-dev
- lld-9 - libxext-dev
- p7zip-full - x11-utils
sources: - libgl1-mesa-dev
- sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main' - libasound-dev
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - libstdc++6
- libfuse2
- unzip
before_script: before_script:
- export ANDROID_HOME=$TRAVIS_BUILD_DIR/sdk - export ARCH=x86_64
- sh scripts/travis_common_deps.sh - sh scripts/travis_common_deps.sh
- sh scripts/travis_android_deps.sh - sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
- export ANDROID_SDK_HOME=$ANDROID_HOME
- export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle
script: script:
- cd android - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh full
- export ARCHS="armeabi-v7a" - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh dedicated
- export TOOLCHAIN="host"
- sh compile.sh release
after_script: after_script:
- ccache --show-stats - ccache --show-stats
- mv xashdroid.apk xashdroid-softfp-test.apk - sh scripts/continious_upload.sh xash3d-fwgs-${ARCH}.AppImage xashds-linux-${ARCH}
- sh ../scripts/continious_upload.sh xashdroid-softfp-test.apk
# - # ... # - # ...
# name: "Build for Windows MinGW" # name: "Build for Windows MinGW"
# cache: ccache # cache: ccache
@ -233,17 +185,6 @@ jobs:
after_script: after_script:
- ccache --show-stats - ccache --show-stats
- sh ../scripts/continious_upload.sh xash3d-magx.7z - sh ../scripts/continious_upload.sh xash3d-magx.7z
- # ...
name: "Build for Windows MSVC"
cache: ccache
os: windows
before_script:
- sh scripts/travis_common_deps.sh
- sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
script:
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
after_script:
- sh scripts/continious_upload.sh xash3d-vc.7z xash3d-vc2008-sln.7z
- stage: deploy - stage: deploy
name: "Deploy to github repo" name: "Deploy to github repo"
os: linux os: linux

Loading…
Cancel
Save