diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2020-05-16 13:57:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 13:57:14 +0200 |
| commit | 21ef9e3819634215503a7a4697aaa3d51c7db966 (patch) | |
| tree | 713a4e11a0990e5cf8b9facb45cc9ccfe5b88cf4 | |
| parent | sizeof(char) (diff) | |
| download | cuberite-21ef9e3819634215503a7a4697aaa3d51c7db966.tar cuberite-21ef9e3819634215503a7a4697aaa3d51c7db966.tar.gz cuberite-21ef9e3819634215503a7a4697aaa3d51c7db966.tar.bz2 cuberite-21ef9e3819634215503a7a4697aaa3d51c7db966.tar.lz cuberite-21ef9e3819634215503a7a4697aaa3d51c7db966.tar.xz cuberite-21ef9e3819634215503a7a4697aaa3d51c7db966.tar.zst cuberite-21ef9e3819634215503a7a4697aaa3d51c7db966.zip | |
| -rw-r--r-- | .travis.yml | 26 | ||||
| -rwxr-xr-x | travisbuild.sh | 12 |
2 files changed, 23 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index b5d953c18..8b517c5f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,42 +13,42 @@ addons: confinement: classic channel: latest -matrix: +jobs: include: - # AppleClang Release # OSX workers are slower to start up. Having these first in the build matrix makes travis faster overall. - - os: osx + - name: "AppleClang - Release" + os: osx osx_image: xcode11.3 before_install: - HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache env: &Release - TRAVIS_CUBERITE_BUILD_TYPE=RELEASE - # AppleClang Debug - - os: osx + - name: "AppleClang - Debug" + os: osx osx_image: xcode11.3 before_install: - HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache env: &Debug - TRAVIS_CUBERITE_BUILD_TYPE=DEBUG - # Clang 7.0 - Release - - compiler: clang + - name: "Clang 7.0 - Release" + compiler: clang before_install: &use-cmake - export PATH=/snap/bin/:${PATH} env: *Release - # Clang 7.0 - Debug - - compiler: clang + - name: "Clang 7.0 - Debug" + compiler: clang before_install: *use-cmake env: *Debug - # GCC 7.4 - Release, CMake 3.12 - - compiler: gcc + - name: "GCC 7.4 - Release, CMake 3.12" + compiler: gcc env: *Release - # GCC 7.4 - Debug - - compiler: gcc + - name: "GCC 7.4 - Debug" + compiler: gcc before_install: *use-cmake env: *Debug diff --git a/travisbuild.sh b/travisbuild.sh index b4163f0a8..adcf5d12c 100755 --- a/travisbuild.sh +++ b/travisbuild.sh @@ -11,16 +11,24 @@ if [ `which ccache` ]; then export CCACHE_CPP2=true CACHE_ARGS="-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" echo "Using ccache installed at $(which ccache)" + ccache --max-size=3G + ccache -z # Zero statistics fi cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1 ${CACHE_ARGS}; echo "Building..." -cmake --build . -- -j 2; -ctest -j 2 -V; +cmake --build . -j 2 + +if [ `which ccache` ]; then + echo "Built with ccache, outputting cache stats..." + ccache -s +fi echo "Testing..." +ctest -j 2 -V; + cd Server/; touch apiCheckFailed.flag if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then |