ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Travis] Use newer clang+llvm and libvulkan, remove outdated comments 

macOS/OS X support isn't happening any time soon..
Add periods to the end of sentences in documentation for consistency, and remove empty spaces.
clang/llvm-8 wasn't used due to requiring a libav rebase.
This commit is contained in:
Margen67 2019-07-18 01:59:13 -07:00 committed by GitHub
parent c1f5bf71d8
commit d285fbd639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.travis.yml
View File

@ -1,12 +1,8 @@
# Make Travis use docker (for faster builds, in theory). # Make Travis use docker (for faster builds, in theory).
# TODO(benvanik): re-enable when clang-3.8 is whitelisted.
# https://github.com/travis-ci/apt-package-whitelist/issues/474
#sudo: false
language: cpp language: cpp
os: os:
- linux - linux
# - osx
sudo: required sudo: required
dist: xenial dist: xenial
@ -14,10 +10,10 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-xenial-6.0 - llvm-toolchain-xenial-7
packages: packages:
- clang-6.0 - clang-7
- llvm-6.0-dev - llvm-7-dev
- g++-8 - g++-8
- python3 - python3
- libc++-dev - libc++-dev
@ -32,26 +28,26 @@ addons:
matrix: matrix:
include: include:
- env: C_COMPILER=clang-6.0 CXX_COMPILER=clang++-6.0 LINT=true - env: C_COMPILER=clang-7 CXX_COMPILER=clang++-7 LINT=true
sudo: false sudo: false
- env: C_COMPILER=clang-6.0 CXX_COMPILER=clang++-6.0 BUILD=true CONFIG=Debug - env: C_COMPILER=clang-7 CXX_COMPILER=clang++-7 BUILD=true CONFIG=Debug
- env: C_COMPILER=clang-6.0 CXX_COMPILER=clang++-6.0 BUILD=true CONFIG=Release - env: C_COMPILER=clang-7 CXX_COMPILER=clang++-7 BUILD=true CONFIG=Release
git: git:
# We handle submodules ourselves in xenia-build setup. # We handle submodules ourselves in xenia-build setup.
submodules: false submodules: false
before_script: before_script:
- export LIBVULKAN_VERSION=1.0.61.1 - export LIBVULKAN_VERSION=1.1.70
- export CXX=$CXX_COMPILER - export CXX=$CXX_COMPILER
- export CC=$C_COMPILER - export CC=$C_COMPILER
# Dump useful info. # Dump useful info.
- $CXX --version - $CXX --version
- python3 --version - python3 --version
# Add Vulkan dependencies # Add Vulkan dependencies.
- travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_$LIBVULKAN_VERSION+dfsg1-1ubuntu1~16.04.1_amd64.deb - travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_$LIBVULKAN_VERSION+dfsg1-1_amd64.deb
- travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_$LIBVULKAN_VERSION+dfsg1-1ubuntu1~16.04.1_amd64.deb - travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_$LIBVULKAN_VERSION+dfsg1-1_amd64.deb
- if [[ $BUILD == true ]]; then sudo dpkg -i libvulkan1_$LIBVULKAN_VERSION+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_$LIBVULKAN_VERSION+dfsg1-1ubuntu1~16.04.1_amd64.deb; fi - if [[ $BUILD == true ]]; then sudo dpkg -i libvulkan1_$LIBVULKAN_VERSION+dfsg1-1_amd64.deb libvulkan-dev_$LIBVULKAN_VERSION+dfsg1-1_amd64.deb; fi
# Prepare environment (pull dependencies, build tools). # Prepare environment (pull dependencies, build tools).
- travis_retry ./xenia-build setup - travis_retry ./xenia-build setup
@ -59,10 +55,10 @@ script:
# Run linter. # Run linter.
- if [[ $LINT == true ]]; then ./xenia-build lint --all; fi - if [[ $LINT == true ]]; then ./xenia-build lint --all; fi
# Build and run base tests # Build and run base tests.
- if [[ $BUILD == true ]]; then ./xenia-build build --config=$CONFIG --target=xenia-base-tests; fi - if [[ $BUILD == true ]]; then ./xenia-build build --config=$CONFIG --target=xenia-base-tests; fi
- if [[ $BUILD == true ]]; then ./build/bin/Linux/$CONFIG/xenia-base-tests; fi - if [[ $BUILD == true ]]; then ./build/bin/Linux/$CONFIG/xenia-base-tests; fi
# Build and run ppc tests # Build and run ppc tests.
- if [[ $BUILD == true ]]; then ./xenia-build build --config=$CONFIG --target=xenia-cpu-ppc-tests; fi - if [[ $BUILD == true ]]; then ./xenia-build build --config=$CONFIG --target=xenia-cpu-ppc-tests; fi
# - if [[ $BUILD == true ]]; then ./build/bin/Linux/$CONFIG/xenia-cpu-ppc-tests --log_file=stdout; fi # - if [[ $BUILD == true ]]; then ./build/bin/Linux/$CONFIG/xenia-cpu-ppc-tests --log_file=stdout; fi
@ -72,4 +68,3 @@ script:
#- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=false #- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=false
# All tests (with haswell support). # All tests (with haswell support).
#- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=true #- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=true