Skip to content

Commit

Permalink
Try enabling Travis caching.
Browse files Browse the repository at this point in the history
  • Loading branch information
unknownbrackets committed May 14, 2016
1 parent efc8a8e commit e2aca38
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 15 deletions.
5 changes: 4 additions & 1 deletion .travis.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#/bin/bash

export NDK_CCACHE=ccache
NDK_VER=android-ndk-r10d

download_extract() {
Expand Down Expand Up @@ -85,7 +86,7 @@ travis_script() {
# Compile PPSSPP
if [ "$PPSSPP_BUILD_TYPE" = "Linux" ]; then
if [ "$CXX" = "g++" ]; then
export CXX="g++-4.8" CC="gcc-4.8"
export CXX="ccache g++-4.8" CC="ccache gcc-4.8"
fi

if [ "$QT" = "TRUE" ]; then
Expand Down Expand Up @@ -123,6 +124,8 @@ travis_script() {
}

travis_after_success() {
ccache -s

if [ "$PPSSPP_BUILD_TYPE" = "Linux" ]; then
./test.py
fi
Expand Down
43 changes: 29 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,19 @@ sudo: required

language: cpp

os: linux

dist: trusty

compiler:
- gcc
addons:
apt:
packages:
- build-essential
- libgl1-mesa-dev
- libglu1-mesa-dev
- cmake

env:
- PPSSPP_BUILD_TYPE=Linux
CMAKE=TRUE
- PPSSPP_BUILD_TYPE=Android
- PPSSPP_BUILD_TYPE=Blackberry
CMAKE=TRUE
- PPSSPP_BUILD_TYPE=Symbian
cache:
- apt
- ccache

notifications:
irc:
Expand All @@ -30,15 +29,31 @@ notifications:

matrix:
include:
- compiler: clang
- os: linux
compiler: "gcc linux"
env: PPSSPP_BUILD_TYPE=Linux
CMAKE=TRUE
- os: linux
compiler: "gcc android"
env: PPSSPP_BUILD_TYPE=Android
- os: linux
compiler: "gcc blackberry"
env: PPSSPP_BUILD_TYPE=Blackberry
CMAKE=TRUE
- os: linux
compiler: "gcc symbian"
env: PPSSPP_BUILD_TYPE=Symbian
- os: linux
compiler: "clang linux"
env: PPSSPP_BUILD_TYPE=Linux
CMAKE=TRUE
- compiler: gcc
- os: linux
compiler: "gcc qt"
env: PPSSPP_BUILD_TYPE=Linux
QT=TRUE
# Can't get iOS to work.
# - os: osx
# compiler: clang
# compiler: "clang ios"
# env: PPSSPP_BUILD_TYPE=iOS
# CMAKE=TRUE

Expand Down

0 comments on commit e2aca38

Please sign in to comment.