Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-14 03:23:29 +00:00
Code Issues Releases Activity

Remove ccache; it breaks the build with GCC 7 & 8.

Browse Source
This commit is contained in:
Brenden Matthews 2018-12-22 18:50:39 -05:00
parent bc60fb2c2f
commit 2e6894f564
No known key found for this signature in database
GPG Key ID: 60FBD122E62B0D30
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -244,8 +244,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then eval "${MATRIX_EVAL}" ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then eval "${MATRIX_EVAL}" ; fi
- | - |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
HOMEBREW_NO_AUTO_UPDATE=1 brew install freetype gettext lua imlib2 librsvg ccache docbook2x ; HOMEBREW_NO_AUTO_UPDATE=1 brew install freetype gettext lua imlib2 librsvg docbook2x ;
export PATH="/usr/local/opt/ccache/libexec:$PATH";
fi fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link gettext --force ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link gettext --force ; fi
before_script: before_script:
@ -255,7 +254,6 @@ before_script:
cmake \ cmake \
-DMAINTAINER_MODE=ON \ -DMAINTAINER_MODE=ON \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DBUILD_MYSQL=ON \ -DBUILD_MYSQL=ON \
-DBUILD_LUA_IMLIB2=ON \ -DBUILD_LUA_IMLIB2=ON \
-DBUILD_LUA_RSVG=ON \ -DBUILD_LUA_RSVG=ON \
@ -276,7 +274,6 @@ before_script:
cmake \ cmake \
-DMAINTAINER_MODE=ON \ -DMAINTAINER_MODE=ON \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DBUILD_X11=OFF \ -DBUILD_X11=OFF \
-DBUILD_MYSQL=ON \ -DBUILD_MYSQL=ON \
-DBUILD_LUA_CAIRO=ON \ -DBUILD_LUA_CAIRO=ON \
@ -297,7 +294,6 @@ before_script:
mkdir build && cd build mkdir build && cd build
cmake \ cmake \
-DMAINTAINER_MODE=ON \ -DMAINTAINER_MODE=ON \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DBUILD_LUA_RSVG=ON \ -DBUILD_LUA_RSVG=ON \
-DBUILD_LUA_IMLIB2=ON \ -DBUILD_LUA_IMLIB2=ON \
.. ..
@ -308,7 +304,6 @@ before_script:
cmake \ cmake \
-DMAINTAINER_MODE=ON \ -DMAINTAINER_MODE=ON \
-DBUILD_X11=OFF \ -DBUILD_X11=OFF \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DBUILD_X11=OFF \ -DBUILD_X11=OFF \
-DBUILD_LUA_RSVG=ON \ -DBUILD_LUA_RSVG=ON \
-DBUILD_LUA_IMLIB2=ON \ -DBUILD_LUA_IMLIB2=ON \
@ -332,6 +327,5 @@ branches:
- master - master
sudo: false sudo: false
cache: cache:
- ccache: true
- directories: - directories:
- "$HOME/.sonar/cache" - "$HOME/.sonar/cache"